diff --git a/Android/Application/AndroidManifest.xml b/Android/Application/AndroidManifest.xml index 876e5b122a7c577c3e1a4ccc9a5b8255a847e0b1..04e09fbf598a2614fd2725d3f03f81e1d5c93306 100644 --- a/Android/Application/AndroidManifest.xml +++ b/Android/Application/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/Android/Application/mksettings b/Android/Application/mksettings index 25d0edf85339bbfd615e320f6dd2e588562a697d..8c25e48775c9fcc9a3d8d9d43472849fd57a0386 100755 --- a/Android/Application/mksettings +++ b/Android/Application/mksettings @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Android/Application/newstrings b/Android/Application/newstrings index 3d1e2f7846033cf8e04ec8b1899f60e1411ae57c..654b7bff2c2b4350d09a25eeb6dfc98be3428482 100755 --- a/Android/Application/newstrings +++ b/Android/Application/newstrings @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Android/Application/res/xml/usb_devices.xml b/Android/Application/res/xml/usb_devices.xml index df49a47c0d5e180400fc83990498a2d2a2b1f507..25867cfab5f386789214f7328ca9b1edba82ca9d 100644 --- a/Android/Application/res/xml/usb_devices.xml +++ b/Android/Application/res/xml/usb_devices.xml @@ -272,9 +272,13 @@ - + + + + + diff --git a/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java b/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java index dfb7b3469f186d5b21ab1c9ab48fa83a1e6a8275..8f341cebb9c26ecb5a436f0bcb8bd0838cc7b45f 100644 --- a/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java +++ b/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2012 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java b/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java index c28d760103ef857ccc8c391db1c8bd9e5966ba71..2cde2df9d42fb79c514cfd4cdfb99f0e441cde09 100644 --- a/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java +++ b/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2012 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java b/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java index c11610a5970843a1e87b32de3048e594905f5267..6257921eb63c501187c2382901adeade9a7b8735 100644 --- a/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2012 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java b/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java index 3d03b94fc5cf420b77226fc31e80375b8f56cabd..a29976ec06c710dfcace79f6d5958c121456eaf6 100644 --- a/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java +++ b/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java b/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java index 2ca9a58f47661af1545f804d2cf4ba35a04bff2e..5ac7c1f1c249e7df56753369e5427507ad28f059 100644 --- a/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java +++ b/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/BrailleService.java b/Android/Application/src/org/a11y/brltty/android/BrailleService.java index d3b44623e929d0160d200bd8224b127eb0f3269a..dfaa8920bf93ddd4ff3e6f2b1f266aff5bee3c8e 100644 --- a/Android/Application/src/org/a11y/brltty/android/BrailleService.java +++ b/Android/Application/src/org/a11y/brltty/android/BrailleService.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2012 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/CoreThread.java b/Android/Application/src/org/a11y/brltty/android/CoreThread.java index 975a736f243ef712304ea9fde292df6496cddaa2..8411aa869b6df6d83ada95da0460209426bbe516 100644 --- a/Android/Application/src/org/a11y/brltty/android/CoreThread.java +++ b/Android/Application/src/org/a11y/brltty/android/CoreThread.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java b/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java index 14497a95b9c6238926a3a381b8c03f7037c6ece2..38087f7ec497b1c34f7c5543b0919a2379e82b8a 100644 --- a/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java +++ b/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/InputService.java b/Android/Application/src/org/a11y/brltty/android/InputService.java index f89846c20e7b18cb89fa7d7dad782cbe89452f26..59f2ba608c7bedebf2fda6f5c0e981a9e87f9446 100644 --- a/Android/Application/src/org/a11y/brltty/android/InputService.java +++ b/Android/Application/src/org/a11y/brltty/android/InputService.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java b/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java index 74625d19996b1dfc0977281d67306cddf47bce5c..fb808928b1aa97f61b511b806840544f84d024df 100644 --- a/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java b/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java index 1b26fecfd0b14533c999754834b784c62eadee80..5a23d9250fc25e68796248cfa0fb894b27139959 100644 --- a/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java +++ b/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/LockUtilities.java b/Android/Application/src/org/a11y/brltty/android/LockUtilities.java index 33ac1c573d89194925118b1cc5805309204f13b1..1544727ab2ae9c7fdf04205cec421baee068e574 100644 --- a/Android/Application/src/org/a11y/brltty/android/LockUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/LockUtilities.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/PcmDevice.java b/Android/Application/src/org/a11y/brltty/android/PcmDevice.java index 32ca7f8bf1ba8e74d67726fff4f7b00a4099042c..d9618f7db8eaa8411d3a22343ea3f66356e8c142 100644 --- a/Android/Application/src/org/a11y/brltty/android/PcmDevice.java +++ b/Android/Application/src/org/a11y/brltty/android/PcmDevice.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java b/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java index becc4b0dd773887fcc66c4ca3d57889c17dc552b..5409c5a958091695913741e3b199738fe7c531a0 100644 --- a/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java +++ b/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java b/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java index 32e99d4eb60a37167d55f532fc088bf0a20baf25..a57538fa47f56a224feafe1f86cfa5124fc8781a 100644 --- a/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java +++ b/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java b/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java index a9ba0354060f00e929b0ca2f96a9088cd9ab31f3..f78ac14d52ac361d9b873912117fcf5b65307989 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenElement.java b/Android/Application/src/org/a11y/brltty/android/ScreenElement.java index 4b276013ec07a3790c5996ccd2e6dca1fc454c5b..cff2176a9001e9ef39127e4843b5b2a426310c49 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenElement.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenElement.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java b/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java index 30581c5efee225d0a5859ba411d6d24f43718ff1..6084f96025f43b21cfdf65c140929150026a4e3d 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java b/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java index 725cb5b77004fb99243eeef816d910d721f0f7d0..4518d443179a4e50396fadeb71696d557b4ec32b 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java b/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java index 69358bcd09b3dcf15a9135dbb3e888740a510ef4..6ee1c70fd1837269d01b9aec101792da7f3957a0 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java b/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java index 9ccea6bd7e16d1aa391da1e01f9307ee12104bfd..b9f9dd07864b19dcef176a19afdfc0c1e622c61c 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java b/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java index 704464d35c57cb326e3a7a6d66321a53707720f3..907ff1dfda5caa203f3d3eabdcd7e08e6a50a199 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java b/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java index d23919142bdbc1c2c3306dfe5f7b04a5c092c2da..360843beff21515cea387beb9abb6e8e722d9b66 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java b/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java index 8022d5600b9822f82200f8f6d1d013563914dffc..0ca44ce3306d5a5f043238415e540e71f98f5cc4 100644 --- a/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java +++ b/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/SingletonReference.java b/Android/Application/src/org/a11y/brltty/android/SingletonReference.java index 459602970cbcb2d0779f64503bb0dfb725f3e557..c91ebe795639afe91884dfa4878b9d3a79bb394d 100644 --- a/Android/Application/src/org/a11y/brltty/android/SingletonReference.java +++ b/Android/Application/src/org/a11y/brltty/android/SingletonReference.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java b/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java index 97c6f30d9b1e24b48ad04b84abad98d70cb0c8f3..cd019573c611b857d22af016b7812a660c45910a 100644 --- a/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java +++ b/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/StringMaker.java b/Android/Application/src/org/a11y/brltty/android/StringMaker.java index 8c8fcc260850c6fd0d681a93d5c820cefdf9abbc..8e6db3ed8c90ea0ca2e1e7b69ae681d6be1396db 100644 --- a/Android/Application/src/org/a11y/brltty/android/StringMaker.java +++ b/Android/Application/src/org/a11y/brltty/android/StringMaker.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java b/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java index c1e7edfdc7317642689539f165777a43a4a74cd1..da64fbe33fa17ce25f7b164ca9dc0c1228bde51b 100644 --- a/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java +++ b/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/UsbHelper.java b/Android/Application/src/org/a11y/brltty/android/UsbHelper.java index 1e86eae00d0e51c1441c2ca894ca3a02437f7cca..03b302f4e99ff0fe584f7a3ea0e50500546947f0 100644 --- a/Android/Application/src/org/a11y/brltty/android/UsbHelper.java +++ b/Android/Application/src/org/a11y/brltty/android/UsbHelper.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java b/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java index 5ed05c55122350ddc601e78583c4a91a85df145d..635c8200d20fe0e4fd9f0c2f99169c865cc95e91 100644 --- a/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java +++ b/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Core/Makefile b/Android/Core/Makefile index b6a396acc9add7cee359c36da3618f03da8d6641..b004b4a39206e411540b16584fcf91c1a3800270 100644 --- a/Android/Core/Makefile +++ b/Android/Core/Makefile @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java b/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java index 4712090c1b04e945f925c1f77a4634c409c53b0a..9274466836c6a461d066d8948c06729329b24b58 100644 --- a/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java +++ b/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2013 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java b/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java index 4b9b0cc27bd37fe4536c2326cf0b0400c632acab..b066f54b854991e1b9229ca185177ed1729688c7 100644 --- a/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java +++ b/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2013 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Core/src/org/a11y/brltty/core/LogLevel.java b/Android/Core/src/org/a11y/brltty/core/LogLevel.java index 1965895eff65e347ec3e90d862694d330c850385..c70dc6b551c4d42e3b13a81d80595c8de0c4d417 100644 --- a/Android/Core/src/org/a11y/brltty/core/LogLevel.java +++ b/Android/Core/src/org/a11y/brltty/core/LogLevel.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2013 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java b/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java index 1b7cd5f6d2566bc000ed882336529f2c52de7999..474fdaa96e5298807a52c2beeabc44a3ece10c98 100644 --- a/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java +++ b/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2013 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Authorization/Polkit/org.brltty.policy b/Authorization/Polkit/org.brltty.policy new file mode 100644 index 0000000000000000000000000000000000000000..5460e8147d831f9df9ccefcbab25797167dd9377 --- /dev/null +++ b/Authorization/Polkit/org.brltty.policy @@ -0,0 +1,22 @@ + + + + + + The BRLTTY Developers + http://www.brltty.com/ + + + Write to the braille display + Privileges are required to access the braille display + + + no + no + yes + + + diff --git a/Autostart/Hotplug/brltty b/Autostart/Hotplug/brltty index 70153d722fcec2baf1cd084f217ae4d4806032e4..923b004d6d3332d2d5ba02e93db2ad8c5d9b940c 100755 --- a/Autostart/Hotplug/brltty +++ b/Autostart/Hotplug/brltty @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Autostart/Hotplug/brltty.usermap b/Autostart/Hotplug/brltty.usermap index 8b9a32a73ff2acdf64b6d542c799f3df224bf5cb..970bd7f45c3a76e8a7a794549946f1a973401da0 100644 --- a/Autostart/Hotplug/brltty.usermap +++ b/Autostart/Hotplug/brltty.usermap @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -287,9 +287,13 @@ brltty 0x0003 0x1148 0x0301 brltty 0x0003 0x1c71 0xc004 # Device: 1C71:C005 -# HumanWare [all models] +# HumanWare [all models (serial protocol)] brltty 0x0003 0x1c71 0xc005 +# Device: 1C71:C006 +# HumanWare [all models (HID protocol)] +brltty 0x0003 0x1c71 0xc006 + # Device: 1FE4:0003 # HandyTech [USB-HID adapter] brltty 0x0003 0x1fe4 0x0003 diff --git a/Autostart/Systemd/Makefile.in b/Autostart/Systemd/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..a7443dc9bf78adc7e3c3e0201d70a1d00fcb6473 --- /dev/null +++ b/Autostart/Systemd/Makefile.in @@ -0,0 +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-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 . +############################################################################### + +SYSTEMD_UNIT_DIRECTORY = $(INSTALL_ROOT)/usr/lib/systemd/system +SYSTEMD_SCRIPT_DIRECTORY = $(INSTALL_ROOT)$(sbindir) + +install: install-units install-scripts + +install-unit-directory: + $(INSTALL_DIRECTORY) $(SYSTEMD_UNIT_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-script-directory: + $(INSTALL_DIRECTORY) $(SYSTEMD_SCRIPT_DIRECTORY) + +install-scripts: install-script-directory + $(INSTALL_SCRIPT) $(SRC_DIR)/brltty-systemd-wrapper $(SYSTEMD_SCRIPT_DIRECTORY) + +uninstall: + -rm -f $(SYSTEMD_UNIT_DIRECTORY)/brltty.* + -rm -f $(SYSTEMD_UNIT_DIRECTORY)/brltty@.* + -rm -f $(SYSTEMD_SCRIPT_DIRECTORY)/brltty-systemd-* + diff --git a/Autostart/Systemd/brltty-old.service b/Autostart/Systemd/brltty-old.service deleted file mode 100644 index b776096b412b1df7076c24762a414a5e903385ba..0000000000000000000000000000000000000000 --- a/Autostart/Systemd/brltty-old.service +++ /dev/null @@ -1,34 +0,0 @@ -[Unit] - -Description=Braille Device Support -Documentation=man:brltty(1) -Documentation=http://mielke.cc/brltty/ - -DefaultDependencies=no -Before=sysinit.target - - -[Service] - -Type=forking -PIDFile=/run/brltty.pid -ExecStart=/bin/brltty -P /run/brltty.pid - -TimeoutStartSec=5 -TimeoutStopSec=10 - -Restart=always -RestartSec=30 - -Nice=-10 -OOMScoreAdjust=-900 - -ProtectHome=read-only -ProtectSystem=full -SystemCallArchitectures=native - - -[Install] -WantedBy=sysinit.target - - diff --git a/Autostart/Systemd/brltty-systemd-wrapper b/Autostart/Systemd/brltty-systemd-wrapper new file mode 100755 index 0000000000000000000000000000000000000000..9900136bdd78957ee93c7d402b2077055523a6ad --- /dev/null +++ b/Autostart/Systemd/brltty-systemd-wrapper @@ -0,0 +1,80 @@ +#!/bin/bash -p +############################################################################### +# BRLTTY - A background process providing access to 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 . +############################################################################### + +set -e +readonly defaultInstance="/etc/brltty.conf" +readonly programName="${0##*/}" + +programMessage() { + local message="${1}" + + echo >&2 "${programName}: ${message}" +} + +syntaxError() { + local message="${1}" + + programMessage "${message}" + exit 2 +} + +semanticError() { + local message="${1}" + + programMessage "${message}" + exit 3 +} + +readonly currentInstance="${BRLTTY_SYSTEMD_INSTANCE:-${defaultInstance}}" +[ -e "${currentInstance}" ] || semanticError "instance not found: ${currentInstance}" +[ -r "${currentInstance}" ] || semanticError "instance not readable: ${currentInstance}" + +if [ -c "${currentInstance}" ] +then + udevMaintained=false + + while read line + do + if [[ "${line}" =~ ^'N: ' ]] + then + udevMaintained=true + elif [[ "${line}" =~ ^'E: '([^ =]+)=(.*) ]] + then + name="${BASH_REMATCH[1]}" + value="${BASH_REMATCH[2]}" + + [[ "${name}" =~ ^'BRLTTY_' ]] || continue + [ -z "${!name}" ] || continue + + export "${name}=${value}" + fi + done < <((udevadm info --name="${currentInstance}" --export 2>/dev/null)) + + "${udevMaintained}" || semanticError "instance not maintained by udev: ${currentInstance}" +elif [ -f "${currentInstance}" ] +then + export BRLTTY_CONFIGURATION_FILE="${currentInstance}" +else + semanticError "unrecognized instance type: ${currentInstance}" +fi + +set -- "${BRLTTY_EXECUTABLE_PATH:-brltty}" -E ${BRLTTY_EXECUTABLE_ARGUMENTS} "${@}" +programMessage "starting executable: ${*}" +exec "${@}" +exit "${?}" diff --git a/Autostart/Systemd/brltty.service b/Autostart/Systemd/brltty.service new file mode 100644 index 0000000000000000000000000000000000000000..f28bb8cd7ecfad0ea9a8a09736b653051df5d231 --- /dev/null +++ b/Autostart/Systemd/brltty.service @@ -0,0 +1,22 @@ +[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 --git a/Autostart/Systemd/brltty.service.in b/Autostart/Systemd/brltty.service.in deleted file mode 100644 index 87f26ca47c6ceb64916712966b3f3f26511baf84..0000000000000000000000000000000000000000 --- a/Autostart/Systemd/brltty.service.in +++ /dev/null @@ -1,35 +0,0 @@ -[Unit] - -Description=Braille Device Support -Documentation=man:brltty(1) -Documentation=http://brltty.com/ - -DefaultDependencies=no -Before=sysinit.target - -RequiresMountsFor=@UPDATABLE_DIRECTORY@ - - -[Service] - -Type=notify -ExecStart=/bin/brltty --no-daemon - -TimeoutStartSec=5 -TimeoutStopSec=10 - -Restart=always -RestartSec=30 - -Nice=-10 -OOMScoreAdjust=-900 - -ProtectHome=read-only -ProtectSystem=full -SystemCallArchitectures=native - - -[Install] -WantedBy=sysinit.target - - diff --git a/Autostart/Systemd/brltty@.service.in b/Autostart/Systemd/brltty@.service.in new file mode 100644 index 0000000000000000000000000000000000000000..8e719375361bbe7c762af3cbb836bf7dd719a6e3 --- /dev/null +++ b/Autostart/Systemd/brltty@.service.in @@ -0,0 +1,36 @@ +[Unit] + +Description=BRLTTY Instance: %I +Documentation=man:brltty(1) +Documentation=@PACKAGE_URL@ + +DefaultDependencies=no +StopWhenUnneeded=true + +RequiresMountsFor=@UPDATABLE_DIRECTORY@ + + +[Service] + +Environment="BRLTTY_SYSTEMD_INSTANCE=%I" +ExecStart=/sbin/brltty-systemd-wrapper + +Type=@SYSTEMD_SERVICE_TYPE@ +Environment="BRLTTY_EXECUTABLE_ARGUMENTS=@SYSTEMD_SERVICE_ARGUMENTS@" + +PIDFile=%t/brltty-%i.pid +Environment=BRLTTY_PID_FILE=%t/brltty-%i.pid + +TimeoutStartSec=5 +TimeoutStopSec=10 + +Restart=always +RestartSec=30 + +Nice=-10 +OOMScoreAdjust=-900 + +ProtectHome=read-only +ProtectSystem=full + + diff --git a/Autostart/Systemd/reldeps.mk b/Autostart/Systemd/reldeps.mk new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/Autostart/Udev/udev.rules b/Autostart/Udev/udev.rules index 095ae1249e82579b8419cb60db596035a0704333..006d034d7b8deed31094b39fdd59b106839ba16e 100644 --- a/Autostart/Udev/udev.rules +++ b/Autostart/Udev/udev.rules @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -35,241 +35,241 @@ LABEL="brltty_usb_begin" # HIMS [Sync Braille] # HandyTech [FTDI chip] # MDV [all models] -ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" # Device: 10C4:EA60 # Generic Identifier @@ -277,175 +277,185 @@ ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_r # Product: CP210x UART Bridge / myAVR mySmartUSB light # BrailleMemo [Pocket] # Seika [Braille Display] -ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +ENV{PRODUCT}=="1c71/c004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bn", GOTO="brltty_usb_run" # Device: 1C71:C005 -# HumanWare [all models] -ENV{PRODUCT}=="1c71/c005/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run" +# 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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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}="auto", GOTO="brltty_usb_run" +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:$sysfs{serial}" +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}="/var/run/brltty.$kernel.pid" +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_DRIVER}-$env{BRLTTY_BRAILLE_DEVICE}" -RUN+="/bin/brltty -E -P$env{BRLTTY_PID_FILE}" +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" diff --git a/Autostart/Windows/brltty-libusb-1.0.inf b/Autostart/Windows/brltty-libusb-1.0.inf index 980ab16eef2a943760bf520cdce344733c2f4b0b..d79bf09c5ca7c2cf4759478a2a1b62dab7305593 100644 --- a/Autostart/Windows/brltty-libusb-1.0.inf +++ b/Autostart/Windows/brltty-libusb-1.0.inf @@ -241,7 +241,10 @@ HKR,,Icon,,-20 "LibUSB-1.0: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 ; Device: 1C71:C005 -"LibUSB-1.0: HumanWare [all models]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 +"LibUSB-1.0: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 + +; Device: 1C71:C006 +"LibUSB-1.0: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1FE4:0003 "LibUSB-1.0: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -543,7 +546,10 @@ HKR,,Icon,,-20 "LibUSB-1.0: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 ; Device: 1C71:C005 -"LibUSB-1.0: HumanWare [all models]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 +"LibUSB-1.0: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 + +; Device: 1C71:C006 +"LibUSB-1.0: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1FE4:0003 "LibUSB-1.0: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 diff --git a/Autostart/Windows/brltty-libusb.inf b/Autostart/Windows/brltty-libusb.inf index 8d61a88828d6bb4ab31533122b153e1bd4dfe660..1ea939b7e7aacbd250674eed65c5326eff1199c1 100644 --- a/Autostart/Windows/brltty-libusb.inf +++ b/Autostart/Windows/brltty-libusb.inf @@ -320,7 +320,10 @@ ServiceBinary = %12%\libusb0.sys "LibUSB-Win32: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 ; Device: 1C71:C005 -"LibUSB-Win32: HumanWare [all models]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 +"LibUSB-Win32: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 + +; Device: 1C71:C006 +"LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1FE4:0003 "LibUSB-Win32: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -622,7 +625,10 @@ ServiceBinary = %12%\libusb0.sys "LibUSB-Win32: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 ; Device: 1C71:C005 -"LibUSB-Win32: HumanWare [all models]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 +"LibUSB-Win32: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 + +; Device: 1C71:C006 +"LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1FE4:0003 "LibUSB-Win32: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -924,7 +930,10 @@ ServiceBinary = %12%\libusb0.sys "LibUSB-Win32: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 ; Device: 1C71:C005 -"LibUSB-Win32: HumanWare [all models]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 +"LibUSB-Win32: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 + +; Device: 1C71:C006 +"LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1FE4:0003 "LibUSB-Win32: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 diff --git a/Bindings/Java/Brlapi.java b/Bindings/Java/Brlapi.java index 27bd5368e4edfff4d46b1cc699b580d00a119e65..f8862ed96a6d58c9d5024f2a607a76bd6303854c 100644 --- a/Bindings/Java/Brlapi.java +++ b/Bindings/Java/Brlapi.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/ConnectionSettings.java b/Bindings/Java/ConnectionSettings.java index 238e8bf43f363609023f2b3cb26fc00ea66f218f..6e781688e7dd59955dcd571983d407a9fab5791e 100644 --- a/Bindings/Java/ConnectionSettings.java +++ b/Bindings/Java/ConnectionSettings.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/DisplaySize.java b/Bindings/Java/DisplaySize.java index 1dca219d9aa3f1c4f87f052c41f3f21cf7e98c4c..807b216f71e9cbcc4852cf52f329298dedca3f6c 100644 --- a/Bindings/Java/DisplaySize.java +++ b/Bindings/Java/DisplaySize.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Error.java b/Bindings/Java/Error.java index 6d9ae3ed61c95f8dda8b370c270db4ca351f7710..9901124a33ea420cc60fa8725bb67640a045aeae 100644 --- a/Bindings/Java/Error.java +++ b/Bindings/Java/Error.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Exception.java b/Bindings/Java/Exception.java index 5aa265116633bd49254878343ba394d3efb4cb1c..c2e9d62471ab2b26185d93bc284ed1f270ee5ef1 100644 --- a/Bindings/Java/Exception.java +++ b/Bindings/Java/Exception.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Key.java b/Bindings/Java/Key.java index 7ce6a13f5da9d1b76dcad37bcefadff449f37755..05d11ec8e345c32005c6ef29817496caa9b1bb4b 100644 --- a/Bindings/Java/Key.java +++ b/Bindings/Java/Key.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Makefile.in b/Bindings/Java/Makefile.in index 0d1b1d8487ad45493236b7b9e101011b8bed266a..b37de0d798bb1e645ce2108f0dfad4cb49af7d57 100644 --- a/Bindings/Java/Makefile.in +++ b/Bindings/Java/Makefile.in @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by +# Copyright (C) 2006-2016 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Java/Native.java b/Bindings/Java/Native.java index e09355c11da4b37197e43e88ae7958f4efbf2776..9f183567a2935f7d1b0020a084c7c6c6e0478f90 100644 --- a/Bindings/Java/Native.java +++ b/Bindings/Java/Native.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Test.java b/Bindings/Java/Test.java index dc04767f8c64efc5ce7041d0d5b97cc462ee306c..fc599fbefcc4d0169f112ae1e9b0292b8a10b0b8 100644 --- a/Bindings/Java/Test.java +++ b/Bindings/Java/Test.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/WriteArguments.java b/Bindings/Java/WriteArguments.java index ddee4a4b86b427e86a2695cfa9da817efdb612d4..4898c0b3360a353e72c378af269238fa52ce8f3d 100644 --- a/Bindings/Java/WriteArguments.java +++ b/Bindings/Java/WriteArguments.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/apitest b/Bindings/Java/apitest index db2e2f860f60315bb73d7a0443056c119278b9ce..6ceee2a75222ba08a35b917e338275d1594813f8 100755 --- a/Bindings/Java/apitest +++ b/Bindings/Java/apitest @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by +# Copyright (C) 2006-2016 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Java/bindings.c b/Bindings/Java/bindings.c index f550994200684be48b2cd731111b94a78b466826..755ce883ddce21dd9739747459e0f9f8539ec3a8 100644 --- a/Bindings/Java/bindings.c +++ b/Bindings/Java/bindings.c @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by + * Copyright (C) 2006-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/bindings.m4 b/Bindings/Java/bindings.m4 index c913c59c44d4606d5bdc820909df67ab70ec1fdd..7891fae2a5b5cab155e256b5ad5c69f8e87c6b5e 100644 --- a/Bindings/Java/bindings.m4 +++ b/Bindings/Java/bindings.m4 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by +# Copyright (C) 2006-2016 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Java/constants.awk b/Bindings/Java/constants.awk index 625b890e3008911f47b604e3d122698f3ca6f711..e60b435fcb4b89d55ab23ba399c655a53223c7c7 100644 --- a/Bindings/Java/constants.awk +++ b/Bindings/Java/constants.awk @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by +# Copyright (C) 2006-2016 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Lisp/Makefile.in b/Bindings/Lisp/Makefile.in index 57b28a4705c9217e6b7ad9cdfaf25c8567feba97..31e6a4c7f3b0fcfa4d7300d02554aecab1771941 100644 --- a/Bindings/Lisp/Makefile.in +++ b/Bindings/Lisp/Makefile.in @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Mario Lang +# Copyright (C) 2006-2016 by Mario Lang # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Lisp/bindings.m4 b/Bindings/Lisp/bindings.m4 index 7cacadb1c6381723ceb41e5f223b882abad62933..5b6562582f5f9016b75b6928773a5d09485cc7f5 100644 --- a/Bindings/Lisp/bindings.m4 +++ b/Bindings/Lisp/bindings.m4 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Lisp/brlapi.asd b/Bindings/Lisp/brlapi.asd index 2aafd894415e9a8e6958543e3555877839166a88..20bc66148fba6f245526011c997c9b0ca0f860bf 100644 --- a/Bindings/Lisp/brlapi.asd +++ b/Bindings/Lisp/brlapi.asd @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; libbrlapi - A library providing access to braille terminals for applications. ; -; Copyright (C) 2006-2015 by Mario Lang +; Copyright (C) 2006-2016 by Mario Lang ; ; libbrlapi comes with ABSOLUTELY NO WARRANTY. ; diff --git a/Bindings/Lisp/brlapi.lisp.in b/Bindings/Lisp/brlapi.lisp.in index 1e693f589a73df098e4711ac5aad4cc45d7620c6..316c6c1f3fb35b76c9d28e5e94c0540c39543446 100644 --- a/Bindings/Lisp/brlapi.lisp.in +++ b/Bindings/Lisp/brlapi.lisp.in @@ -2,7 +2,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; libbrlapi - A library providing access to braille terminals for applications. ; -; Copyright (C) 2006-2015 by Mario Lang +; Copyright (C) 2006-2016 by Mario Lang ; ; libbrlapi comes with ABSOLUTELY NO WARRANTY. ; diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in index 6ffb176e74dec3154cd2abfed4c8fdd8d9d40940..a85b7b3031395abc8e184da2b2ca11f5d7a80d5f 100644 --- a/Bindings/OCaml/Makefile.in +++ b/Bindings/OCaml/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/OCaml/brlapi_stubs.c b/Bindings/OCaml/brlapi_stubs.c index 00f67f055a5b722aa61e8eace8cf02deb457880c..1e66f9ee6e187dea2481a21174aacc09ebdfcef4 100644 --- a/Bindings/OCaml/brlapi_stubs.c +++ b/Bindings/OCaml/brlapi_stubs.c @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2005-2015 by + * Copyright (C) 2005-2016 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff --git a/Bindings/OCaml/constants.awk b/Bindings/OCaml/constants.awk index 882a300fca77124cd50a2627f482349ace49fc68..af5a4a9a31ee5aebb4f2f26b55ac1cd4ea2d15b6 100644 --- a/Bindings/OCaml/constants.awk +++ b/Bindings/OCaml/constants.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/OCaml/main.ml b/Bindings/OCaml/main.ml index baf88ab890c2cd1ef798e23ec03e7e97e1ba7164..4c93ada49a138316f85105cfd5b7c77fa8ff974b 100644 --- a/Bindings/OCaml/main.ml +++ b/Bindings/OCaml/main.ml @@ -1,7 +1,7 @@ (* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff --git a/Bindings/OCaml/main.mli b/Bindings/OCaml/main.mli index eab984d982b09e59375e299151fabc8db9e3c8eb..03ad5a3bce640df7258d8529037ee2cad01d18c2 100644 --- a/Bindings/OCaml/main.mli +++ b/Bindings/OCaml/main.mli @@ -1,7 +1,7 @@ (* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff --git a/Bindings/Python/Makefile.in b/Bindings/Python/Makefile.in index 840a3734b6a1bf7d29d2e31341a59655382fbfc0..af80e778c2724c56cf5350cd6d90e51b03d65a88 100644 --- a/Bindings/Python/Makefile.in +++ b/Bindings/Python/Makefile.in @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/apitest.py b/Bindings/Python/apitest.py index 5e4b3de7a72a9e19e9cf18e220c32a9731a044b8..b1f45cc7e26fc2437d1122b6ee879e2373a3ecf4 100755 --- a/Bindings/Python/apitest.py +++ b/Bindings/Python/apitest.py @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Python/bindings.c b/Bindings/Python/bindings.c index acc8e65ade8604e066f2b61607cfe9e2060c10e5..62bced9dcdf866842c53514a97e18550bac152c5 100644 --- a/Bindings/Python/bindings.c +++ b/Bindings/Python/bindings.c @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2005-2015 by + * Copyright (C) 2005-2016 by * Alexis Robert * Samuel Thibault * diff --git a/Bindings/Python/bindings.h b/Bindings/Python/bindings.h index ff4f9e6e18ea7c374997f8356dcf389bd83a244f..0222dc5611203ea76d512424164243061e7cb0a5 100644 --- a/Bindings/Python/bindings.h +++ b/Bindings/Python/bindings.h @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2005-2015 by + * Copyright (C) 2005-2016 by * Alexis Robert * Samuel Thibault * diff --git a/Bindings/Python/bindings.m4 b/Bindings/Python/bindings.m4 index 7f75e5599632c4e95f2987686c4c3dd9d0ca47c6..731221876dbdf816b76d0f0f9dc1912236c48e6a 100644 --- a/Bindings/Python/bindings.m4 +++ b/Bindings/Python/bindings.m4 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/brlapi.pyx b/Bindings/Python/brlapi.pyx index d5060207f65e9a7de4cc0004d02c7d6d2c1341bd..5a209794d1d38785d52659a30821b52e8509182f 100644 --- a/Bindings/Python/brlapi.pyx +++ b/Bindings/Python/brlapi.pyx @@ -58,7 +58,7 @@ except brlapi.ConnectionError as e: ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/c_brlapi.pxd b/Bindings/Python/c_brlapi.pxd index 5935daff5874b89be0bcad9ba66ec24ea6ba565f..3564dfe7b16fc8b38638a687065c6a6b3eb6f548 100644 --- a/Bindings/Python/c_brlapi.pxd +++ b/Bindings/Python/c_brlapi.pxd @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/constants.awk b/Bindings/Python/constants.awk index a8682ad6a8a7f189c2c6991f23564154cc72cc62..c1c77bdf7711179df801826b043925df46b83299 100644 --- a/Bindings/Python/constants.awk +++ b/Bindings/Python/constants.awk @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/mkdoc.py b/Bindings/Python/mkdoc.py index 4e64bead8ee31e5088916823e06f0be0aa905bf3..c2167d3bd0a437f95edeef348bc2806e5a7e472a 100644 --- a/Bindings/Python/mkdoc.py +++ b/Bindings/Python/mkdoc.py @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/setup.py.in b/Bindings/Python/setup.py.in index 6dd162cce53f1629f99ace5570ab1bb7ee2aaaac..1f333b0b0f4c8cfd32f856aa9dee64023af1c52c 100644 --- a/Bindings/Python/setup.py.in +++ b/Bindings/Python/setup.py.in @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Tcl/Makefile.in b/Bindings/Tcl/Makefile.in index e7ea9133092da8ae620566ada0603f962cc13baf..9fd3b82757e946da1bfdd4ff954bb5369b710e7d 100644 --- a/Bindings/Tcl/Makefile.in +++ b/Bindings/Tcl/Makefile.in @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Tcl/apitest b/Bindings/Tcl/apitest index df43eeecbebe00c4edd187cf93d951898e0f5d27..b1a4965acf2a8d75b3b9ff12bffccd6ae40ed902 100755 --- a/Bindings/Tcl/apitest +++ b/Bindings/Tcl/apitest @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Tcl/apitest.tcl b/Bindings/Tcl/apitest.tcl index ec1d8d047ca06eaf363af31680f77f89638b2fc9..f45f3067e803d8478ddb530297b17a2ec243527f 100755 --- a/Bindings/Tcl/apitest.tcl +++ b/Bindings/Tcl/apitest.tcl @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Tcl/bindings.c b/Bindings/Tcl/bindings.c index 4ad328f8e0f8cb0db51e205ab14c822c5f9aabd6..1980ddb66ea1eb05d100d29dd066dcbdb27f1328 100644 --- a/Bindings/Tcl/bindings.c +++ b/Bindings/Tcl/bindings.c @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2015 by Dave Mielke + * Copyright (C) 2006-2016 by Dave Mielke * * libbrlapi comes with ABSOLUTELY NO WARRANTY. * diff --git a/Bindings/Tcl/bindings.m4 b/Bindings/Tcl/bindings.m4 index a28b70114994708ef58c82693686e7600db7bb2f..b27ab15aa82db9204840334af1d306acdabfb497 100644 --- a/Bindings/Tcl/bindings.m4 +++ b/Bindings/Tcl/bindings.m4 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Tcl/prologue.tcl b/Bindings/Tcl/prologue.tcl index 789d9e4409becaf6be9be0bc106470710182b69e..5d2ccf3a8db02c28b108617c124cd32ad4a1d517 100644 --- a/Bindings/Tcl/prologue.tcl +++ b/Bindings/Tcl/prologue.tcl @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bootdisks/bp2cf b/Bootdisks/bp2cf index 8563b369ab5cf8443610f4e7341045411e28775d..546d2791bec77e76d46fd00e0bdc8eb8b29355b6 100755 --- a/Bootdisks/bp2cf +++ b/Bootdisks/bp2cf @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bootdisks/rhmkiso b/Bootdisks/rhmkiso index 33d94cb927ad1fbb9740e8859689cc42b7031d6c..6536cb30aee0af614f28d17a2d7e6d0953d1c7c4 100755 --- a/Bootdisks/rhmkiso +++ b/Bootdisks/rhmkiso @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/DOS/brltt531.zip b/DOS/brltt531.zip deleted file mode 100644 index f4500017362e0fd967a7c0f79678f22788b156ca..0000000000000000000000000000000000000000 Binary files a/DOS/brltt531.zip and /dev/null differ diff --git a/DOS/mkdosarc b/DOS/mkdosarc index 06b0fb26a4b612d4b15948d68ac29cba3875f14e..07f859a4d5c79ee9ea1152d7f757c0dc62e57ce1 100755 --- a/DOS/mkdosarc +++ b/DOS/mkdosarc @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/DOS/mkdostools b/DOS/mkdostools index 0d0d5569e99b8f43211908d7ed285b05ce6f093c..01fe9540d12a9563f2a870e6d06a44b998d61fdd 100755 --- a/DOS/mkdostools +++ b/DOS/mkdostools @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Documents/BrlAPIref/html/brlapi_8h.html b/Documents/BrlAPIref/html/brlapi_8h.html index febc9897ce232d6a1ebbdb862080ad4aaae6f431..6e4e5b032f2e1828d66eeaf055222fcc5a8d96a2 100644 --- a/Documents/BrlAPIref/html/brlapi_8h.html +++ b/Documents/BrlAPIref/html/brlapi_8h.html @@ -90,13 +90,13 @@ Data Structures - + - + diff --git a/Documents/BrlAPIref/html/brlapi_8h_source.html b/Documents/BrlAPIref/html/brlapi_8h_source.html index 7b9df4657595bc8c285ea0c2abb3acd247ce1039..a9ea2c25307b6dd978db8f4f78c80fd725693a9f 100644 --- a/Documents/BrlAPIref/html/brlapi_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi_8h_source.html @@ -55,7 +55,7 @@
2 /*
3  * libbrlapi - A library providing access to braille terminals for applications.
4  *
-
5  * Copyright (C) 2002-2015 by
+
5  * Copyright (C) 2002-2016 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.4"
+
38 #define BRLAPI_RELEASE "0.6.5"
39 
41 #define BRLAPI_MAJOR 0
42 
44 #define BRLAPI_MINOR 6
45 
-
47 #define BRLAPI_REVISION 4
+
47 #define BRLAPI_REVISION 5
48 
51 /* Types are defined there */
52 #include <sys/types.h>
diff --git a/Documents/BrlAPIref/html/brlapi__constants_8h_source.html b/Documents/BrlAPIref/html/brlapi__constants_8h_source.html index 60078ed14b13e742c862ddc7c8a54542be3fe842..5f2fe6b3a9e25c0df691939df2a4cc155ca199da 100644 --- a/Documents/BrlAPIref/html/brlapi__constants_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi__constants_8h_source.html @@ -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-2015 by
+
4  * Copyright (C) 2002-2016 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff --git a/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html b/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html index d77c756189184f0116668fc4c98c37240d22fd68..b0104f1668ff34a67fdc3e501c7fbf3096b37208 100644 --- a/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html @@ -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-2015 by
+
4  * Copyright (C) 2002-2016 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff --git a/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html b/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html index 4d67c6f857b38c89748e1b4a24a479ebff12f419..3ca029b7925c00afabd043b40bb1b3af5b9ee909 100644 --- a/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html @@ -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-2015 by
+
4  * Copyright (C) 2002-2016 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff --git a/Documents/BrlAPIref/html/group__brlapi__version.html b/Documents/BrlAPIref/html/group__brlapi__version.html index 83f313739ec483d4f707270aa6693b253d321cd2..674d1c222992d0a2e60ac09a61344a8f75163b05 100644 --- a/Documents/BrlAPIref/html/group__brlapi__version.html +++ b/Documents/BrlAPIref/html/group__brlapi__version.html @@ -46,13 +46,13 @@

Macros

#define BRLAPI_RELEASE   "0.6.4"
#define BRLAPI_RELEASE   "0.6.5"
 
#define BRLAPI_MAJOR   0
 
#define BRLAPI_MINOR   6
 
#define BRLAPI_REVISION   4
#define BRLAPI_REVISION   5
 
#define BRLAPI_STDCALL
 
- + - +

Macros

#define BRLAPI_RELEASE   "0.6.4"
#define BRLAPI_RELEASE   "0.6.5"
 
#define BRLAPI_MAJOR   0
 
#define BRLAPI_MINOR   6
 
#define BRLAPI_REVISION   4
#define BRLAPI_REVISION   5
 

Detailed Description

@@ -88,7 +88,7 @@ Macros
- +
#define BRLAPI_RELEASE   "0.6.4"#define BRLAPI_RELEASE   "0.6.5"
@@ -101,7 +101,7 @@ Macros
- +
#define BRLAPI_REVISION   4#define BRLAPI_REVISION   5
diff --git a/Documents/BrlAPIref/man/man3/_tmp_mktar.P4wu8T_brltty-5.3.1_Programs_.3 b/Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 similarity index 87% rename from Documents/BrlAPIref/man/man3/_tmp_mktar.P4wu8T_brltty-5.3.1_Programs_.3 rename to Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 index 582ec19314214387d1fac5ece742b70a855611c5..e3f1235109856eeac6cb0f361d45a122df5d4235 100644 --- a/Documents/BrlAPIref/man/man3/_tmp_mktar.P4wu8T_brltty-5.3.1_Programs_.3 +++ b/Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 @@ -1,4 +1,4 @@ -.TH "Programs Directory Reference" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Programs Directory Reference" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi.h.3 b/Documents/BrlAPIref/man/man3/brlapi.h.3 index 5d0c6b535f3fd0a287fcc1d40ce2b475d37cc418..010a17717e83cf97c1b52a335775196427dec6fc 100644 --- a/Documents/BrlAPIref/man/man3/brlapi.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi.h" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -52,7 +52,7 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .in +1c .ti -1c -.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.4'" +.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.5'" .br .ti -1c .RI "#define \fBBRLAPI_MAJOR\fP 0" @@ -61,7 +61,7 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .RI "#define \fBBRLAPI_MINOR\fP 6" .br .ti -1c -.RI "#define \fBBRLAPI_REVISION\fP 4" +.RI "#define \fBBRLAPI_REVISION\fP 5" .br .ti -1c .RI "#define \fBBRLAPI_STDCALL\fP" diff --git a/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 index 906cd33a32c85258d144f5b34e917ea89de6620d..e3587de906eb32e1e20dc6063f33124978a778c8 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_authClientPacket_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_authClientPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 index 89238d2e4eabb3567a9332431151bd711ec78d23..08b595207fb368cc4708f89f1f7bc08a5fdfd139 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_authServerPacket_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_authServerPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_connection.3 b/Documents/BrlAPIref/man/man3/brlapi_connection.3 index 94db42f4aa05c41ba2a54777703441164b745d53..51fbccf9bab57efdd11d0c8c1c32df670250d4d5 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_connection.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_connection.3 @@ -1,4 +1,4 @@ -.TH "Connecting to BrlAPI" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Connecting to BrlAPI" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 b/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 index 2507fef40fad80ace53c33ed45744a3d472e39e4..906cfe6b5c0180b86ce0652a450c444fe395d58f 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_connectionSettings_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_connectionSettings_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 b/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 index c558679d2f63a6b169e0fc769e436d9bfb06520b..061e6ddc6788fe2f01edd6da585361b9e9497e35 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi_constants.h" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_constants.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 b/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 index 3c3e66190f8710f93e8bea4b975efcffb7e22e69..53f4b2391f9901b921b5b7244a8b0a5e6216e212 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 @@ -1,4 +1,4 @@ -.TH "Deprecated names" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Deprecated names" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 b/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 index 6c544a529d7662db91dfed683414e3868c7cea71..98cafeeea68802259987d20500a8f09a6b0d50f6 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_describedKeyCode_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_describedKeyCode_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 b/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 index 482b13025a0b02a3244945adefe4a1efefe818e7..b3c1b0642059db8861181eb1a4e800d4d572bc88 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 @@ -1,4 +1,4 @@ -.TH "Driver-Specific modes" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Driver-Specific modes" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_error.3 b/Documents/BrlAPIref/man/man3/brlapi_error.3 index 5bac7499e3ac53e578d7f0f3d85c920884364aa2..79728243e51889b5d4d0eec2d16bbe05b4d6f514 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_error.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_error.3 @@ -1,4 +1,4 @@ -.TH "Error handling" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Error handling" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 index 8c09704daddfc6ba9b05d32f1547cc6074698976..64b6104d793b5fac381ed15431899d2bfa0d101b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_errorPacket_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_errorPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_error_t.3 b/Documents/BrlAPIref/man/man3/brlapi_error_t.3 index 5415dc72313c63d321b57b77a4500628f0719b2a..b34ad1e9f23699d9cec8f08842127cce56af38f3 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_error_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_error_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_error_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_error_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 b/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 index dd3e34052d78c59e2ad717c62b2ebdc5dcfbec78..880d4cf1fe8d08dbeadce6613b5467c1a71c7dde 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_expandedKeyCode_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_expandedKeyCode_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 index d9e5adf736501b74247314312b10d3cf54b03ba5..eec96282baf3b059d7965fd6268a7415bd37ee7b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_getDriverSpecificModePacket_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_getDriverSpecificModePacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_handles.3 b/Documents/BrlAPIref/man/man3/brlapi_handles.3 index 3d778f2a9833df57080d1e41b126738cfc44ed4e..f2d0270dcaa5ed67977dd6e2c31263661e477d44 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_handles.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_handles.3 @@ -1,4 +1,4 @@ -.TH "BrlAPI handles" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "BrlAPI handles" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_header_t.3 b/Documents/BrlAPIref/man/man3/brlapi_header_t.3 index f0f022d61fec2bc764660753a449a163e803c7ed..a0935ae88c95b7ab1eea319a905be1b78538989f 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_header_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_header_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_header_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_header_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_info.3 b/Documents/BrlAPIref/man/man3/brlapi_info.3 index e1d04968da90f17abb403a3e304e6401908e8454..ea724c54f48962b9aa4c376adc8eaf95cb2dadd1 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_info.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_info.3 @@ -1,4 +1,4 @@ -.TH "Getting Terminal information" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Getting Terminal information" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 b/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 index 41caf6c263d0515b50bf71c5a5d59570564a2dd6..2be16c8ad16e31fd60f65dd21a61e10167749a7e 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 @@ -1,4 +1,4 @@ -.TH "Types and Defines fore BrlAPI Key Codes" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Types and Defines fore BrlAPI Key Codes" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 b/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 index c9359fd65d5ae88a86740c5aa53c09ad017c2865..6f4cd635b26e15885b48e9dcd623f4af4df6768b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi_keycodes.h" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_keycodes.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_keys.3 b/Documents/BrlAPIref/man/man3/brlapi_keys.3 index 54f6cf7507a2fdcfb63401676f36fa5f37cdaa87..ac645fe20d8c8c07f8242bd130b3fb2bfe55abb9 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_keys.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_keys.3 @@ -1,4 +1,4 @@ -.TH "Reading key presses" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Reading key presses" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 b/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 index 47b09e6c760d7b5ecdb4febce2bcf4b83863ccd9..891581d3594d52c427cf35a055c84b866ddbda25 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_packet_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_packet_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_protocol.3 b/Documents/BrlAPIref/man/man3/brlapi_protocol.3 index dfdf96eaa1a592d0b752fec985663313176347b3..0a0a0af0662690a8e72152747a0e509a008af900 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_protocol.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_protocol.3 @@ -1,4 +1,4 @@ -.TH "BrlAPI's protocol" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "BrlAPI's protocol" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 b/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 index c4ec93a855e1e9b2e87faebc4629fef4728156ee..60af417d0e4c3088bcff74ecb84d15c13edea154 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi_protocol.h" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_protocol.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_range_t.3 b/Documents/BrlAPIref/man/man3/brlapi_range_t.3 index dbfbb9417d6a050bd3d5fd5eb9c2fce816bf0a63..7630c56f55a810adb6fe57d816c17d330d139c4d 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_range_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_range_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_range_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_range_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_tty.3 b/Documents/BrlAPIref/man/man3/brlapi_tty.3 index 22c22a20aa918fc30da8c076e68e2bb8dfe9926a..20e9f718d35b08dff06f3eb7a84d33e7de567a49 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_tty.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_tty.3 @@ -1,4 +1,4 @@ -.TH "Entering & leaving tty mode" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Entering & leaving tty mode" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_version.3 b/Documents/BrlAPIref/man/man3/brlapi_version.3 index b30bede02946a7a6bdafe9a43cf92de572ea2f17..c81a628ad88254193d5246775aad978f9a7eff36 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_version.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_version.3 @@ -1,4 +1,4 @@ -.TH "Version of the BrlAPI library" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Version of the BrlAPI library" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -7,7 +7,7 @@ Version of the BrlAPI library \- .in +1c .ti -1c -.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.4'" +.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.5'" .br .ti -1c .RI "#define \fBBRLAPI_MAJOR\fP 0" @@ -16,7 +16,7 @@ Version of the BrlAPI library \- .RI "#define \fBBRLAPI_MINOR\fP 6" .br .ti -1c -.RI "#define \fBBRLAPI_REVISION\fP 4" +.RI "#define \fBBRLAPI_REVISION\fP 5" .br .in -1c .SH "Detailed Description" @@ -28,9 +28,9 @@ Version of the BrlAPI library \- Library major version\&. .SS "#define BRLAPI_MINOR 6" Library minor version\&. -.SS "#define BRLAPI_RELEASE '0\&.6\&.4'" +.SS "#define BRLAPI_RELEASE '0\&.6\&.5'" Library version\&. -.SS "#define BRLAPI_REVISION 4" +.SS "#define BRLAPI_REVISION 5" Library revision\&. .SH "Author" .PP diff --git a/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 index 99968ad78eee89a2ba2fe436071b13958cdadf20..2cb31f71a279566216b555b18c12a42b55d3723b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_versionPacket_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_versionPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_write.3 b/Documents/BrlAPIref/man/man3/brlapi_write.3 index 2141bcf7d632c8538b5c5bcb061ee60246687d2c..c5c36f3fbce8ca5026db464984b3d7bdb4f656ee 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_write.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_write.3 @@ -1,4 +1,4 @@ -.TH "Writing on the braille display" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Writing on the braille display" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 index fa9e2d59959bf01200dcb65cb4281e0f7a6bec8b..25607ff8e7739352de8b8f742cd2b29173c6ba1c 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_writeArgumentsPacket_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeArgumentsPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 b/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 index 32bc96c56e19087eb6e17fe6946b6239d22f0c3b..54626eef20c9cb965f09765982d4f883ebdb0d62 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_writeArguments_t" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeArguments_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 b/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 index 0d199360f5ca61ced54feab6c3c8c5d9a204ffc9..ffa6f707782b1bddbe494fc9d54fcd9d294481df 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 @@ -1,4 +1,4 @@ -.TH "brlapi_writeStruct" 3 "Mon Dec 21 2015" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeStruct" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/CONTRIBUTORS b/Documents/CONTRIBUTORS index f02d949754b1ca9a02518021a1403121aec698d1..77329a7018fc9b211e1b66433ae5065b7bb99ae0 100644 --- a/Documents/CONTRIBUTORS +++ b/Documents/CONTRIBUTORS @@ -34,6 +34,7 @@ Mark Mielke Matthew Miller Michael Curran Michel Such +Mike Gorse Mike Pedersen Nicolas Pitre Nikita Tseykovets @@ -50,6 +51,7 @@ Rudolf Weeber Samuel Thibault Samuel Yang Sébastien Hinderer +Sebastian Krahmer Sérgio Neves Simon Kainz Simon Meers diff --git a/Documents/ChangeLog b/Documents/ChangeLog index e117e8b3bc98d1c38c0b43b677d7fc9b8a751a1e..1e6ba75ba5f36b7ec8408dc228e85ee2d4168b6b 100644 --- a/Documents/ChangeLog +++ b/Documents/ChangeLog @@ -1,6 +1,49 @@ Note: this file is in reversed chronological order (bottom to top). +June 28, 2016: + - BRLTTY 5.4 released: + 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. + 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. + HandyTech braille driver changes: + Model detection on Windows has been fixed. + Output errors now restart the driver. + HIMS braille driver changes: + Support for the Smart Beetle has been added. + Newer firmware resolution of qwerty key code conflicts is supported. + 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. + 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. + December 22, 2015: - BRLTTY 5.3.1 released: Linux screen driver fix: diff --git a/Documents/Makefile.in b/Documents/Makefile.in index 17127f65d3736af9a288f59f8c54195296ade667..72feb8dddcb134d32e299fd6bdc01081ff8cbf43 100644 --- a/Documents/Makefile.in +++ b/Documents/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Documents/Manual-BRLTTY/English/BRLTTY-8.html b/Documents/Manual-BRLTTY/English/BRLTTY-8.html index 1ecb81abd08a79dc598093aba9f214619aa52cae..1400e439ea01d78038b66519409e65d5e8db4b7f 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY-8.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY-8.html @@ -49,6 +49,7 @@ BrailleMemoPocket (16) 32 40 BrailleNote18/32 +Apex Braudi BrlAPI B2G @@ -82,6 +83,7 @@ HedoProfiLine HIMSBraille Sense SyncBraille Braille Edge +Smart Beetle HumanWareBrailliant 32/40/80 bi Iris Libbraille diff --git a/Documents/Manual-BRLTTY/English/BRLTTY.html b/Documents/Manual-BRLTTY/English/BRLTTY.html index 8c2a1899614b224c56b3d8dc4ce5e64b4e07afd5..945ce079bb686faceb60f39b4fee374eb3ef509d 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY.html @@ -28,10 +28,10 @@ Contents

Dave Mielke <dave@mielke.cc> -

Version 5.3.1, Dec 2015 + Version 5.4, Jun 2016
- Copyright © 1995-2015 by The BRLTTY Developers. + Copyright © 1995-2016 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 --git a/Documents/Manual-BRLTTY/English/BRLTTY.sgml b/Documents/Manual-BRLTTY/English/BRLTTY.sgml index 9c6a9fa7f19083a9c59c5c1237bebcfc1301e97f..8e715803fb96c55fb334a445eaaddf82a2c36afa 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY.sgml +++ b/Documents/Manual-BRLTTY/English/BRLTTY.sgml @@ -20,9 +20,9 @@ Stéphane Doyon Dave Mielke - Version 5.3.1, Dec 2015 + Version 5.4, Jun 2016 - Copyright © 1995-2015 by The BRLTTY Developers. + Copyright © 1995-2016 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 --git a/Documents/Manual-BRLTTY/English/BRLTTY.txt b/Documents/Manual-BRLTTY/English/BRLTTY.txt index f9a66533c4502dd7c7f00c40f5813b5f58c5635b..27977139080d0aeb86420823874b21d4ac532a70 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY.txt +++ b/Documents/Manual-BRLTTY/English/BRLTTY.txt @@ -9,9 +9,9 @@ Dave Mielke - Version 5.3.1, Dec 2015 + Version 5.4, Jun 2016 - Copyright © 1995-2015 by The BRLTTY Developers. BRLTTY is free soft- + Copyright © 1995-2016 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. @@ -5718,6 +5718,7 @@ 32 40 BrailleNote 18/32 + Apex Braudi BrlAPI B2G @@ -5751,6 +5752,7 @@ HIMS Braille Sense SyncBraille Braille Edge + Smart Beetle HumanWare Brailliant 32/40/80 bi Iris Libbraille diff --git a/Documents/Manual-BRLTTY/English/Makefile.in b/Documents/Manual-BRLTTY/English/Makefile.in index faf42de4726ce505a6cbccfd3e38ed7f23df7fb1..227f258321c937e067b722f10be7c98c6167d739 100644 --- a/Documents/Manual-BRLTTY/English/Makefile.in +++ b/Documents/Manual-BRLTTY/English/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Documents/Manual-BRLTTY/English/braille-drivers.sgml b/Documents/Manual-BRLTTY/English/braille-drivers.sgml index eb3af68be7732a54a273527f24e915186221124e..ae8a0ca8ed0e532e64df5c7cff3051252094cb94 100644 --- a/Documents/Manual-BRLTTY/English/braille-drivers.sgml +++ b/Documents/Manual-BRLTTY/English/braille-drivers.sgml @@ -36,6 +36,7 @@ BrailleMemo |40@ BrailleNote |18/32@ + |Apex@ Braudi@ BrlAPI@ B2G@ @@ -77,6 +78,7 @@ HIMS |Braille Sense@ |SyncBraille@ |Braille Edge@ + |Smart Beetle@ HumanWare |Brailliant 32/40/80 bi@ Iris@ diff --git a/Documents/Manual-BRLTTY/French/BRLTTY-8.html b/Documents/Manual-BRLTTY/French/BRLTTY-8.html index 5cc63d1269021045b72aa7c10e55a99074b71178..6adee517bb0b7cb493e80a48d1873ad6afedad32 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY-8.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY-8.html @@ -44,6 +44,7 @@ BaumBrailleConnect 12/24/32/40/64/80 BrailCommIII BrailleLite18/40/M20/M40 BrailleNote18/32 +Apex Braudi BrlAPI Cebra20/40/60/80/100/120/140 @@ -75,6 +76,7 @@ HedoProfiLine HIMSBraille Sense SyncBraille Braille Edge +Smart Beetle HumanWareBrailliant 32/40/80 bi Iris Libbraille diff --git a/Documents/Manual-BRLTTY/French/BRLTTY.html b/Documents/Manual-BRLTTY/French/BRLTTY.html index 0394cfcf17ebda4b9372fdace8da017c3e069087..04dac8b4b7af23d5a00ade3a212bb46262a5ed11 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY.html @@ -37,10 +37,10 @@ Table des mati pour Traduc.org - Version 5.3.1, Dec 2015 + Version 5.4, Jui 2016
- Copyright © 1995-2015 by Les Développeurs de BRLTTY. + Copyright © 1995-2016 by Les Développeurs 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 ultérieure de la GNU General Public License publiée par diff --git a/Documents/Manual-BRLTTY/French/BRLTTY.sgml b/Documents/Manual-BRLTTY/French/BRLTTY.sgml index 7bd211581025ccf378223292bbc9c0639c40e139..de6bab3d3857166575aeafcfa5b3a9b1892df93a 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY.sgml +++ b/Documents/Manual-BRLTTY/French/BRLTTY.sgml @@ -44,9 +44,9 @@ pour - Version 5.3.1, Dec 2015 + Version 5.4, Jui 2016 - Copyright © 1995-2015 by Les Développeurs de BRLTTY. + Copyright © 1995-2016 by Les Développeurs 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 ultérieure de la GNU General Public License publiée par diff --git a/Documents/Manual-BRLTTY/French/BRLTTY.txt b/Documents/Manual-BRLTTY/French/BRLTTY.txt index 30808154d8c326a23364511f0c6199251f1a1ba2..3356ee4d7789edec7586757e355d045352ae685b 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY.txt +++ b/Documents/Manual-BRLTTY/French/BRLTTY.txt @@ -14,9 +14,9 @@ Jean-Philippe Mengual pour Traduc.org - Version 5.3.1, Dec 2015 + Version 5.4, Jui 2016 - Copyright © 1995-2015 by Les Développeurs de BRLTTY. BRLTTY est un + Copyright © 1995-2016 by Les Développeurs 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 ultérieure de la GGNNUU GGeenneerraall PPuubblliicc LLiicceennssee publiée par TThhee FFrreeee SSooffttwwaarree FFoouunnddaattiioonn. @@ -6154,6 +6154,7 @@ BrailComm III BrailleLite 18/40/M20/M40 BrailleNote 18/32 + Apex Braudi BrlAPI Cebra 20/40/60/80/100/120/140 @@ -6185,6 +6186,7 @@ HIMS Braille Sense SyncBraille Braille Edge + Smart Beetle HumanWare Brailliant 32/40/80 bi Iris Libbraille diff --git a/Documents/Manual-BRLTTY/French/Makefile.in b/Documents/Manual-BRLTTY/French/Makefile.in index 18bd43071875e4d63b7153ce4f1d0658fa52953e..d9a012799ab6137f9acc2bd439629343da7a9515 100644 --- a/Documents/Manual-BRLTTY/French/Makefile.in +++ b/Documents/Manual-BRLTTY/French/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Documents/Manual-BRLTTY/French/braille-drivers.sgml b/Documents/Manual-BRLTTY/French/braille-drivers.sgml index 5b2603c02fd746c6e47e23d190d44c74f55df312..38100f5ce5127fba13371d753cece9fc1ff52f31 100644 --- a/Documents/Manual-BRLTTY/French/braille-drivers.sgml +++ b/Documents/Manual-BRLTTY/French/braille-drivers.sgml @@ -30,6 +30,7 @@ BrailleLite |18/40/M20/M40@ BrailleNote |18/32@ + |Apex@ Braudi@ BrlAPI@ Cebra @@ -69,6 +70,7 @@ HIMS |Braille Sense@ |SyncBraille@ |Braille Edge@ + |Smart Beetle@ HumanWare |Brailliant 32/40/80 bi@ Iris@ diff --git a/Documents/Manual-BrlAPI/English/Makefile.in b/Documents/Manual-BrlAPI/English/Makefile.in index d8ee7d34bbaa8f00eb283e472f1e3b9ec74ec4f0..833a89c3b147d027d55aa5e9196a5cd6f8520a39 100644 --- a/Documents/Manual-BrlAPI/English/Makefile.in +++ b/Documents/Manual-BrlAPI/English/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Documents/README.Systemd b/Documents/README.Systemd index 0f36a004e84c65a46d42a72a4ff147bd3d7c3277..c441fdfa575e8ea189b68f05269c2085a8880b51 100644 --- a/Documents/README.Systemd +++ b/Documents/README.Systemd @@ -3,74 +3,70 @@ Using Systemd Service Management ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. include:: prologue.rst -.. |service warning| replace:: system service support not available on this platform -Choosing the Correct Service Unit -================================= +.. |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 +.. |wrapper directory| replace:: /sbin +.. |wrapper script| replace:: brltty-systemd-wrapper -Two service units for BRLTTY can be found within the ``Autostart/Systemd/`` -subdirectory of BRLTTY's source tree. +Installing the Service Units +============================ -For Older Versions of Systemd ------------------------------ +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:: -If your system is using Systemd for service administration, -but, when configuring BRLTTY, you get the following warning: + pkg-config systemd --variable=systemdsystemunitpath -.. parsed-literal:: |service warning| +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): -then you'll need to use the older service unit. -It's provided as ``brltty-old.service``. -Remember to install it as ``brltty.service``. +1) Define the service instance unit for BRLTTY as follows: -You're getting this warning for one of the following reasons: + .. parsed-literal:: cp |service instance unit| |default system unit directory|/|service instance unit| -* Your system is using an older version of Systemd. +2) Define the service unit for BRLTTY as follows: -* You haven't installed Systemd's development package. - Check your system and your distribution for a package named something like - ``systemd-dev`` or ``systemd-devel``. - If the development package isn't installed but is available - then we recommend that you install it and then reconfigure BRLTTY. + .. parsed-literal:: cp |service unit| |default system unit directory|/|service unit| -For Newer Versions of Systemd ------------------------------ +3) Tell Systemd that these units have been defined as follows:: -If your system is using Systemd for service administration, -and, when configuring BRLTTY, you don't get the following warning: + systemctl daemon-reload -.. parsed-literal:: |service warning| +You also need to install a wrapper script that's used by the service units: -then you should use the newer service unit. -It's provided as ``brltty.service``. + .. parsed-literal:: cp |wrapper script| |wrapper directory|/|wrapper script| + .. parsed-literal:: chmod 755 |wrapper directory|/|wrapper script| -Installing the Service Unit +Managing the BRLTTY Service =========================== -You need to copy the service unit into Systemd's unit directory. You can locate -Systemd's unit directory with this command:: +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: - pkg-config systemd --variable=systemduserunitdir +systemctl start brltty + Explicitly start the ``brltty`` service. -Assuming that Systemd's unit directory is ``/usr/lib/systemd/user`` (please -ensure to use whatever it really is on your system), define the service unit -for BRLTTY as follows:: +systemctl stop brltty + Explicitly stop the ``brltty`` service. - cp brltty.service /usr/lib/systemd/user/brltty.service +systemctl enable brltty + Automatically start the ``brltty`` service on system boot. -Managing the BRLTTY Service -=========================== +systemctl disable brltty + Don't automatically start the ``brltty`` service on system boot. -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 status brltty + Show the current status of the ``brltty`` service. - systemctl status brltty - systemctl start brltty - systemctl stop brltty - systemctl enable brltty - systemctl disable brltty +journalctl -u brltty + Show system log messages pertaining to the ``brltty`` service. -Nothing is automatic. If you'd like to start the ``brltty`` service right away +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 --git a/Documents/brltty.1.in b/Documents/brltty.1.in index 4bc6a9c73fc00d72e93dc76ab23c37297eb4d026..ae69fb233d54469ef151084e4382d8276086f496 100644 --- a/Documents/brltty.1.in +++ b/Documents/brltty.1.in @@ -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-2015 by The BRLTTY Developers. +.\" Copyright (C) 1995-2016 by The BRLTTY Developers. .\" .\" BRLTTY comes with ABSOLUTELY NO WARRANTY. .\" @@ -16,7 +16,7 @@ .\" .\" This software is maintained by Dave Mielke . .\" -.TH "BRLTTY" "1" "2015-12-22" "brltty 5.3.1" "BRLTTY User's Manual" +.TH "BRLTTY" "1" "2016-06-28" "brltty 5.4" "BRLTTY User's Manual" .SH NAME brltty \- refreshable braille display driver for Linux/Unix .SH SYNOPSIS diff --git a/Documents/brltty.conf.in b/Documents/brltty.conf.in index 12b21980f79aedde102c07bdbf13dc83a5fcb15f..94e99b50b21a961789c37e978747f069c554daef 100644 --- a/Documents/brltty.conf.in +++ b/Documents/brltty.conf.in @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -537,6 +537,7 @@ #api-parameters Auth=keyfile:@CONFIGURATION_DIRECTORY@/@api_authkeyfile@ # Require authentication key #api-parameters Auth=user:joe # Allow some local user #api-parameters Auth=group:brl # Allow some local group +#api-parameters Auth=polkit # authenticate via Polkit #api-parameters Host=:0 # Accept only local Unix connections #api-parameters Host=0.0.0.0:0 # Accept any internet connection. #api-parameters StackSize=65536 diff --git a/Documents/brltty.lsm b/Documents/brltty.lsm deleted file mode 100644 index 749666dda2992a0693d1bd2f66375cf7aa1809b5..0000000000000000000000000000000000000000 --- a/Documents/brltty.lsm +++ /dev/null @@ -1,111 +0,0 @@ -Begin4 -Title: brltty -Version: 5.3.1 -Entered-date: 2015/12/22 -Description: Braille Display Driver for Linux/Unix - BRLTTY is a background process (daemon) which provides access - to the console screen (when in text mode) for a blind person - using a refreshable braille display. It drives the braille - display, and provides complete screen review functionality. Some - speech capability has also been incorporated. -Keywords: refreshable braille display console access visually impaired blind linux unix -Author: dave@mielke.cc (Dave Mielke) - nico@fluxnic.net (Nicolas Pitre) - s.doyon@videotron.ca (Stéphane Doyon) - nn201@cus.cam.ac.uk (Nikhil Nair) -Maintained-by: dave@mielke.cc (Dave Mielke) -Primary-site: ftp.ibiblio.org /pub/Linux/system/access - 3900KB brltty-5.3.1.tar.gz - 3900KB brltty-5.3.1-1.src.rpm - 2100KB brltty-5.3.1-1.x86_64.rpm - 270KB brltty-utils-5.3.1-1.x86_64.rpm - 90KB brltty-devel-5.3.1-1.x86_64.rpm - 13KB brltty-braille-brlapi-5.3.1-1.x86_64.rpm - 28KB brltty-braille-xwindow-5.3.1-1.x86_64.rpm - 13KB brltty-speech-espeak-5.3.1-1.x86_64.rpm - 13KB brltty-speech-festival-5.3.1-1.x86_64.rpm - 13KB brltty-speech-flite-5.3.1-1.x86_64.rpm - 13KB brltty-speech-speechd-5.3.1-1.x86_64.rpm - 18KB brltty-screen-atspi-5.3.1-1.x86_64.rpm - 21KB brltty-screen-atspi2-5.3.1-1.x86_64.rpm - 14KB brltty-screen-screen-5.3.1-1.x86_64.rpm - 15KB brltty-5.3.1.README - 6KB brltty-5.3.1.lsm -Alternate-site: ftp://leb.net /pub/blinux/brltty -Original-site: -Platforms: Linux (kernel 1.1.92 or later) - Solaris (release 7 or later) - OpenBSD (release 3.4 or later) - FreeBSD (release 5.1 or later) - NetBSD (release 1.6 or later) - Supported Braille Displays: - - 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, - 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] - - Braudi - - BrlAPI - - 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, - 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] - - 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 [Cebra 20/40/60/80/100/120/140] - - 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] - Supported Speech Synthesizers: - - Alva [Delphi(4nn)] - - Android [text to speech engine] - - BrailleLite - - CombiBraille - - eSpeak [text to speech engine] - - ExternalSpeech [runs /usr/local/bin/externalspeech] - - Festival [text to speech engine] - - FestivalLite [text to speech engine] - - GenericSay [pipes to /usr/local/bin/say] - - Mikropuhe [text to speech engine] - - SpeechDispatcher [text to speech server] - - Swift [text to speech engine] - - Theta [text to speech engine] - - ViaVoice [text to speech engine] -Copying-policy: GPL -End diff --git a/Documents/mkcsvs b/Documents/mkcsvs index 160ccd4fef7e6b93f822bf54d06becf8413f7007..da534e9ba413b982efd2889d69bdb7313b4b4f96 100755 --- a/Documents/mkcsvs +++ b/Documents/mkcsvs @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Documents/xbrlapi.1 b/Documents/xbrlapi.1 index 911e134bb7ab7f790c0937c839b100209d72c9ec..e9dd998332bdd0af0b7f6544a397c4726d953c64 100644 --- a/Documents/xbrlapi.1 +++ b/Documents/xbrlapi.1 @@ -1,4 +1,4 @@ -.TH "XBRLAPI" "1" "2015-12-22" "BrlAPI 0.6.4" "BrlAPI User's Manual" +.TH "XBRLAPI" "1" "2016-06-28" "BrlAPI 0.6.5" "BrlAPI User's Manual" .SH NAME xbrlapi \- X11 BrlAPI helper for Linux/Unix .SH SYNOPSIS diff --git a/Drivers/Braille/Albatross/Makefile.in b/Drivers/Braille/Albatross/Makefile.in index 6057a00d05540f51567a2d2ad701af58b20b5e9f..9beca76dcdf0cd73ddce7187f86b15e4545afcb2 100644 --- a/Drivers/Braille/Albatross/Makefile.in +++ b/Drivers/Braille/Albatross/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Albatross/braille.c b/Drivers/Braille/Albatross/braille.c index 561eba72e585d28b0689a2cf926a4850fefba149..775ba40b4ae9e998fa88cfa25095be06eb00348d 100644 --- a/Drivers/Braille/Albatross/braille.c +++ b/Drivers/Braille/Albatross/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Albatross/brldefs-at.h b/Drivers/Braille/Albatross/brldefs-at.h index fbfcc869214def62230fc343a3886350ec4b6c41..34279230474fef03cf59528621c8107d4d14c0ab 100644 --- a/Drivers/Braille/Albatross/brldefs-at.h +++ b/Drivers/Braille/Albatross/brldefs-at.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Alva/Makefile.in b/Drivers/Braille/Alva/Makefile.in index 9699a8f532a6e405f86c21b064c0a75cbe520c68..ff6ac48c952701aff9e5de38b3b41fe429780a94 100644 --- a/Drivers/Braille/Alva/Makefile.in +++ b/Drivers/Braille/Alva/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Alva/braille.c b/Drivers/Braille/Alva/braille.c index b322f7fc2f50e03a1c349c1f8054b439462db1c1..b13f17e0e2f6c320ef6039177627eb2897ed90be 100644 --- a/Drivers/Braille/Alva/braille.c +++ b/Drivers/Braille/Alva/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Alva/braille.h b/Drivers/Braille/Alva/braille.h index 76cc37f377d61dc80220527d23464c200d93d67c..c063b900c17cb5fee0a3d42eba57093115ec6cab 100644 --- a/Drivers/Braille/Alva/braille.h +++ b/Drivers/Braille/Alva/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Alva/brldefs-al.h b/Drivers/Braille/Alva/brldefs-al.h index efbdc9bd21192be2143f8a02471bb1aa41eb7b92..9759aacbabc23067f11d54fce9fa0df7e45a11ca 100644 --- a/Drivers/Braille/Alva/brldefs-al.h +++ b/Drivers/Braille/Alva/brldefs-al.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/B2G/Makefile.in b/Drivers/Braille/B2G/Makefile.in index c606941486dce7549f9449bb710cd6c530e33943..14b39338e7a49fa476409df53910f5516979cbea 100644 --- a/Drivers/Braille/B2G/Makefile.in +++ b/Drivers/Braille/B2G/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/B2G/braille.c b/Drivers/Braille/B2G/braille.c index f1b36253f5118d40986ce6c2a7d2a54bf0ad0e25..6ebb4e273e90b2a3d57cb33102e92e451e244143 100644 --- a/Drivers/Braille/B2G/braille.c +++ b/Drivers/Braille/B2G/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/B2G/brldefs-bg.h b/Drivers/Braille/B2G/brldefs-bg.h index dbe1dc3c62efc241e21428f4f8f3d94fb41a7fdd..c823688b23a05926c3fc0dea475580378d52a1a7 100644 --- a/Drivers/Braille/B2G/brldefs-bg.h +++ b/Drivers/Braille/B2G/brldefs-bg.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Baum/Makefile.in b/Drivers/Braille/Baum/Makefile.in index 26594b8455ffa132d8fd35d3856d01f178b1c431..feecd806a30526e54f4ca0208c873937ab9ada64 100644 --- a/Drivers/Braille/Baum/Makefile.in +++ b/Drivers/Braille/Baum/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Baum/braille.c b/Drivers/Braille/Baum/braille.c index 7cc0be074bed0ee395d937ce7855fb659e9d7304..16386a97f53634466b637736df515feed221af68 100644 --- a/Drivers/Braille/Baum/braille.c +++ b/Drivers/Braille/Baum/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -1059,6 +1059,7 @@ logBaumPowerdownReason (BaumPowerdownReason reason) { BaumPowerdownReason bit; const char *explanation; } ReasonEntry; + static const ReasonEntry reasonTable[] = { {BAUM_PDR_ProtocolRequested, strtext("driver request")}, {BAUM_PDR_PowerSwitch , strtext("power switch")}, @@ -1066,16 +1067,15 @@ logBaumPowerdownReason (BaumPowerdownReason reason) { {BAUM_PDR_BatteryLow , strtext("battery low")}, {0} }; - const ReasonEntry *entry; char buffer[0X100]; - int length = 0; char delimiter = ':'; + int length; STR_BEGIN(buffer, sizeof(buffer)); STR_PRINTF("%s %s", STRINGIFY(DRIVER_NAME), gettext("Powerdown")); - for (entry=reasonTable; entry->bit; entry+=1) { + for (const ReasonEntry *entry=reasonTable; entry->bit; entry+=1) { if (reason & entry->bit) { STR_PRINTF("%c %s", delimiter, gettext(entry->explanation)); delimiter = ','; @@ -1219,6 +1219,7 @@ verifyBaumPacket ( break; default: + pvd->state = BAUM_PVS_WAITING; return BRL_PVR_INVALID; } } else if (size == 2) { diff --git a/Drivers/Braille/Baum/brldefs-bm.h b/Drivers/Braille/Baum/brldefs-bm.h index 240ed37b9bd048d3ee67506fcd030e9522485eb6..1e602c802b4a5ba4d9a98494594d6c4ff8a29c11 100644 --- a/Drivers/Braille/Baum/brldefs-bm.h +++ b/Drivers/Braille/Baum/brldefs-bm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailComm/Makefile.in b/Drivers/Braille/BrailComm/Makefile.in index dd67792df258817a8ca316206f3a095b9f15621b..565c853e66f46a1d5f90fb24fb910bad06773f87 100644 --- a/Drivers/Braille/BrailComm/Makefile.in +++ b/Drivers/Braille/BrailComm/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/BrailComm/braille.c b/Drivers/Braille/BrailComm/braille.c index bbcde8c0d0ff549bc265416efc64d64db5263664..69f19b4354f311e4ca864c6e7f52114dafcc0fb5 100644 --- a/Drivers/Braille/BrailComm/braille.c +++ b/Drivers/Braille/BrailComm/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailComm/brl-out.h b/Drivers/Braille/BrailComm/brl-out.h index a0d1e9d078b2bdfdfada6f7fd172187c9f780925..337fcbba8dbc16ee61884545760ddc050a96e168 100644 --- a/Drivers/Braille/BrailComm/brl-out.h +++ b/Drivers/Braille/BrailComm/brl-out.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleLite/Makefile.in b/Drivers/Braille/BrailleLite/Makefile.in index 33f77fa6711b3d43af929548b8dd5ce8950ddb28..483b0e9906a6b50db8ba37d69c806bc209505796 100644 --- a/Drivers/Braille/BrailleLite/Makefile.in +++ b/Drivers/Braille/BrailleLite/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/BrailleLite/bindings.h b/Drivers/Braille/BrailleLite/bindings.h index 04d21494aa5ac5baa907daf50b560175a9d8d399..c9a122ee43a195d4c19c85bcdbe2217474cd4e3a 100644 --- a/Drivers/Braille/BrailleLite/bindings.h +++ b/Drivers/Braille/BrailleLite/bindings.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleLite/braille.c b/Drivers/Braille/BrailleLite/braille.c index 190768a51fc86707403654505a71fb9a02bee151..328348bae8524b4a9bb29bb05391a8b69ac7396e 100644 --- a/Drivers/Braille/BrailleLite/braille.c +++ b/Drivers/Braille/BrailleLite/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleLite/braille.h b/Drivers/Braille/BrailleLite/braille.h index e0d18175aaba2e5fbf6274640d8030108b8d2180..82d5d0e5f37e54737e604ed8d365fff885c6b714 100644 --- a/Drivers/Braille/BrailleLite/braille.h +++ b/Drivers/Braille/BrailleLite/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleMemo/Makefile.in b/Drivers/Braille/BrailleMemo/Makefile.in index a4105ca1eddb644618d87795ac4b14e073c2d4d5..ab5ea553d93b88b8ea522dbdf603dae1ba854129 100644 --- a/Drivers/Braille/BrailleMemo/Makefile.in +++ b/Drivers/Braille/BrailleMemo/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/BrailleMemo/braille.c b/Drivers/Braille/BrailleMemo/braille.c index 247c9e75cab5d243c23daf5edcee0a6642292718..36f36d39058f220fcb9ef618f0d30f9e1b1a20ad 100644 --- a/Drivers/Braille/BrailleMemo/braille.c +++ b/Drivers/Braille/BrailleMemo/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleMemo/brldefs-mm.h b/Drivers/Braille/BrailleMemo/brldefs-mm.h index 5504abc2f8595c9ceea2025439344dcb20cf8c31..55b998069cf85f1a64cc522d8e639984a37b7d03 100644 --- a/Drivers/Braille/BrailleMemo/brldefs-mm.h +++ b/Drivers/Braille/BrailleMemo/brldefs-mm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleNote/Makefile.in b/Drivers/Braille/BrailleNote/Makefile.in index ac7fc755d5de739c3255192df1d9cbde6e5967a1..96c22c4099f292d807837c8dea350269624f1c7b 100644 --- a/Drivers/Braille/BrailleNote/Makefile.in +++ b/Drivers/Braille/BrailleNote/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ DRIVER_CODE = bn DRIVER_NAME = BrailleNote -DRIVER_COMMENT = 18/32 +DRIVER_COMMENT = 18/32, Apex DRIVER_VERSION = 1.0 DRIVER_DEVELOPERS = Dave Mielke include $(SRC_TOP)braille.mk diff --git a/Drivers/Braille/BrailleNote/README b/Drivers/Braille/BrailleNote/README index ea7e32cee7ecd7a345ce9b0f2ad82da1444f93cc..9838000cdb9d6d45a363b4d0d87ede855df04c42 100644 --- a/Drivers/Braille/BrailleNote/README +++ b/Drivers/Braille/BrailleNote/README @@ -2,7 +2,7 @@ This directory contains the BRLTTY driver for the BrailleNote [http://www.braillenote.com], which is manufactured by Pulse Data International [http://www.pulsedata.co.nz] of New Zealand. As a component of BRLTTY, this driver is released under the terms of the GNU Public License. It has been -tested with BraillNotes 18 and 32. +tested with BraillNotes 18, 32, and Apex. It was implemented, and is being maintained, by Dave Mielke . Thanks to Mike Pedersen for his help and advice. diff --git a/Drivers/Braille/BrailleNote/braille.c b/Drivers/Braille/BrailleNote/braille.c index 460eef2ab5c2d7ee24c3c62b83342c948ba353a0..1fec1b5beaa1507a48f26a1a5be3b8f21cf5772c 100644 --- a/Drivers/Braille/BrailleNote/braille.c +++ b/Drivers/Braille/BrailleNote/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrailleNote/brldefs-bn.h b/Drivers/Braille/BrailleNote/brldefs-bn.h index a40653e7eaaa28d3c9682c57b8fe981eb6adc5b0..11effce0f70e51d1fa0fb333194375d263ebfc3a 100644 --- a/Drivers/Braille/BrailleNote/brldefs-bn.h +++ b/Drivers/Braille/BrailleNote/brldefs-bn.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Braudi/Makefile.in b/Drivers/Braille/Braudi/Makefile.in index 17543bf18f2753c9e9750bb400db78d722143944..051d920c23546403ff53890f2442271439880a35 100644 --- a/Drivers/Braille/Braudi/Makefile.in +++ b/Drivers/Braille/Braudi/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Braudi/braille.c b/Drivers/Braille/Braudi/braille.c index 01123585d822729ebd11aa83aa8804a5b856d0b9..9b4b21bcb854eafe821beaddb476f75ff3fa3ebb 100644 --- a/Drivers/Braille/Braudi/braille.c +++ b/Drivers/Braille/Braudi/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/BrlAPI/Makefile.in b/Drivers/Braille/BrlAPI/Makefile.in index 1ce546cc7d599680994c462debbbfb0ce9a973a3..a45f6a601b6830b3e3ab77f8145df097a309e60e 100644 --- a/Drivers/Braille/BrlAPI/Makefile.in +++ b/Drivers/Braille/BrlAPI/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/BrlAPI/braille.c b/Drivers/Braille/BrlAPI/braille.c index f59f59785512985b20261c60fa659698c24725f0..ed483e2f431a08c818cbcdfcb02c1d07a0416c59 100644 --- a/Drivers/Braille/BrlAPI/braille.c +++ b/Drivers/Braille/BrlAPI/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Cebra/Makefile.in b/Drivers/Braille/Cebra/Makefile.in index e02b15a924aafdbe6159bda8004b74c7046877cf..11be2ea7a0d81be0d6dcd83618d26417f3dc3306 100644 --- a/Drivers/Braille/Cebra/Makefile.in +++ b/Drivers/Braille/Cebra/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Cebra/braille.c b/Drivers/Braille/Cebra/braille.c index ebdf691f01ad3c390b6efca3ebcca0a3756b34d4..7748b4ad3c18052693001c7d53b740eac8a153ae 100644 --- a/Drivers/Braille/Cebra/braille.c +++ b/Drivers/Braille/Cebra/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Cebra/brldefs-ce.h b/Drivers/Braille/Cebra/brldefs-ce.h index 542fecc4f8a51e899c93c542ee212dd3c9baed5e..4e3e0514e9a729f53c2369321dc22ec2f88e8bb6 100644 --- a/Drivers/Braille/Cebra/brldefs-ce.h +++ b/Drivers/Braille/Cebra/brldefs-ce.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/CombiBraille/Makefile.in b/Drivers/Braille/CombiBraille/Makefile.in index 4bdbdb063eeca94417e278566889f47c038bc59e..69f2ce0efbee2f34b02bbdbd817a43c8876dd8bd 100644 --- a/Drivers/Braille/CombiBraille/Makefile.in +++ b/Drivers/Braille/CombiBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/CombiBraille/braille.c b/Drivers/Braille/CombiBraille/braille.c index f4bfbb51294fc3771d5433d47d84ae1aea9f712d..4c207ed2c8f765c74f18190aba395979edd625a4 100644 --- a/Drivers/Braille/CombiBraille/braille.c +++ b/Drivers/Braille/CombiBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,12 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* CombiBraille/braille.c - Braille display library - * For Tieman B.V.'s CombiBraille (serial interface only) - * Was maintained by Nikhil Nair - * $Id: braille.c,v 1.3 1996/09/24 01:04:29 nn201 Exp $ - */ - #include "prologue.h" #include diff --git a/Drivers/Braille/CombiBraille/braille.h b/Drivers/Braille/CombiBraille/braille.h index dee75f853d3033191c39de97cbda07593264c934..77b6fa949198919b3fb8a1bc4a5f36a48a00ce9b 100644 --- a/Drivers/Braille/CombiBraille/braille.h +++ b/Drivers/Braille/CombiBraille/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,14 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* CombiBraille/braille.h - Configurable definitions for the - * Tieman B.V. CombiBraille driver - * N. Nair, 25 January 1996 - * $Id: brlconf.h,v 1.2 1996/09/21 23:34:52 nn201 Exp $ - * - * Edit as necessary for your system. - */ - /* used by speech.c */ #include "io_serial.h" extern SerialDevice *CB_serialDevice; diff --git a/Drivers/Braille/CombiBraille/brldefs-cb.h b/Drivers/Braille/CombiBraille/brldefs-cb.h index 0c6ec4e37e0451a522eaa1ed20ff103cbc6f29c4..d4aa11be5a68c4ceb38ea6125c65f0e012fec1c4 100644 --- a/Drivers/Braille/CombiBraille/brldefs-cb.h +++ b/Drivers/Braille/CombiBraille/brldefs-cb.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EcoBraille/Makefile.in b/Drivers/Braille/EcoBraille/Makefile.in index 3db0a9ff0c2b08ac39698991d4b7007d299a1e57..3cca1f97d2c787d5c41c92e2b6b3ba34589445f4 100644 --- a/Drivers/Braille/EcoBraille/Makefile.in +++ b/Drivers/Braille/EcoBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/EcoBraille/braille.c b/Drivers/Braille/EcoBraille/braille.c index 3c76853e685ed78f7d5557da60c1e235832821bc..edc029faeb65a42dc16614be847545ce82529505 100644 --- a/Drivers/Braille/EcoBraille/braille.c +++ b/Drivers/Braille/EcoBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EcoBraille/braille.h b/Drivers/Braille/EcoBraille/braille.h index 836c9288c0bb37c0af5d10bcb61289e96258a7a5..f0deadcc6130875e484e14d51bc6f236266e517d 100644 --- a/Drivers/Braille/EcoBraille/braille.h +++ b/Drivers/Braille/EcoBraille/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in index 68e3bf397a3af962b0a64b1bad163c648c438fd7..f4fcbc2abfbbee3c76dbb94baf7cc795c39b091b 100644 --- a/Drivers/Braille/EuroBraille/Makefile.in +++ b/Drivers/Braille/EuroBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/EuroBraille/brldefs-eu.h b/Drivers/Braille/EuroBraille/brldefs-eu.h index 50c6f31ab5cc2c3bb75e8130e68133105db97d88..8598df21549b1511b95d7a8e2fba9b0a7cac54ef 100644 --- a/Drivers/Braille/EuroBraille/brldefs-eu.h +++ b/Drivers/Braille/EuroBraille/brldefs-eu.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EuroBraille/eu_braille.c b/Drivers/Braille/EuroBraille/eu_braille.c index 79d95e5265e743c10eaf1c89fc66e55449afadc7..804f52526a563265449e402e2feec1400e19fbab 100644 --- a/Drivers/Braille/EuroBraille/eu_braille.c +++ b/Drivers/Braille/EuroBraille/eu_braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EuroBraille/eu_clio.c b/Drivers/Braille/EuroBraille/eu_clio.c index 630b7c9a6c00ea56a88a80857dac6db370db256e..8184547d7bc34cabb2b8d3cc9aec43343d11dc09 100644 --- a/Drivers/Braille/EuroBraille/eu_clio.c +++ b/Drivers/Braille/EuroBraille/eu_clio.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EuroBraille/eu_esysiris.c b/Drivers/Braille/EuroBraille/eu_esysiris.c index 21e22b2b252691b9a273af7fb2cf7d57d4477717..c724074abd523e886079ed94e14af92b36fabec8 100644 --- a/Drivers/Braille/EuroBraille/eu_esysiris.c +++ b/Drivers/Braille/EuroBraille/eu_esysiris.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EuroBraille/eu_protocol.h b/Drivers/Braille/EuroBraille/eu_protocol.h index 55cd687d02e9014ce09ddab1ecdca9f4a6d460cc..e66674ab35b502bc828be4b927bc52612b631baa 100644 --- a/Drivers/Braille/EuroBraille/eu_protocol.h +++ b/Drivers/Braille/EuroBraille/eu_protocol.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/FreedomScientific/Makefile.in b/Drivers/Braille/FreedomScientific/Makefile.in index b6b6016f4ea8057fb803630e26672ad96c6e97e3..6e94f0b94fe902ebdced547a18a500f722bf6e46 100644 --- a/Drivers/Braille/FreedomScientific/Makefile.in +++ b/Drivers/Braille/FreedomScientific/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/FreedomScientific/braille.c b/Drivers/Braille/FreedomScientific/braille.c index c745cc1264b9b3da4b5fe368632dc71d9494e6fe..cd92bd6de0a1464f78c46b49e90207c7401d4ad1 100644 --- a/Drivers/Braille/FreedomScientific/braille.c +++ b/Drivers/Braille/FreedomScientific/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/FreedomScientific/brldefs-fs.h b/Drivers/Braille/FreedomScientific/brldefs-fs.h index df1edfe815727a0a6d716e59d5c607749c6bdecd..7c1b61d111fdea8b8f82559925ccb8bdcc3c43ff 100644 --- a/Drivers/Braille/FreedomScientific/brldefs-fs.h +++ b/Drivers/Braille/FreedomScientific/brldefs-fs.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/HIMS/Makefile.in b/Drivers/Braille/HIMS/Makefile.in index 811f558bdc948ef949fbd9f02c7ad4a7d2bc097f..672294d13176856eb82781db95455712df9f6042 100644 --- a/Drivers/Braille/HIMS/Makefile.in +++ b/Drivers/Braille/HIMS/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ DRIVER_CODE = hm DRIVER_NAME = HIMS -DRIVER_COMMENT = Braille Sense, SyncBraille, Braille Edge +DRIVER_COMMENT = Braille Sense, SyncBraille, Braille Edge, Smart Beetle DRIVER_VERSION = DRIVER_DEVELOPERS = Dave Mielke include $(SRC_TOP)braille.mk diff --git a/Drivers/Braille/HIMS/braille.c b/Drivers/Braille/HIMS/braille.c index daf3de14e9eedbc4de432cf46e9541af17f25ddc..295b36df3850ff8511c51c7b9886c6cf897952f1 100644 --- a/Drivers/Braille/HIMS/braille.c +++ b/Drivers/Braille/HIMS/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -134,11 +134,28 @@ BEGIN_KEY_NAME_TABLES(sync) KEY_NAME_TABLE(SB_scroll), END_KEY_NAME_TABLES +BEGIN_KEY_NAME_TABLE(beetle) + KEY_NAME_ENTRY(HM_KEY_BS_RightScrollUp, "Backward"), + KEY_NAME_ENTRY(HM_KEY_BS_RightScrollDown, "Forward"), + + KEY_NAME_ENTRY(HM_KEY_F1, "F1"), + KEY_NAME_ENTRY(HM_KEY_F4, "F2"), + KEY_NAME_ENTRY(HM_KEY_F3, "F3"), + KEY_NAME_ENTRY(HM_KEY_F2, "F4"), +END_KEY_NAME_TABLE + +BEGIN_KEY_NAME_TABLES(beetle) + KEY_NAME_TABLE(common), + KEY_NAME_TABLE(braille), + KEY_NAME_TABLE(beetle), +END_KEY_NAME_TABLES + DEFINE_KEY_TABLE(pan) DEFINE_KEY_TABLE(scroll) DEFINE_KEY_TABLE(qwerty) DEFINE_KEY_TABLE(edge) DEFINE_KEY_TABLE(sync) +DEFINE_KEY_TABLE(beetle) BEGIN_KEY_TABLE_LIST &KEY_TABLE_DEFINITION(pan), @@ -146,6 +163,7 @@ BEGIN_KEY_TABLE_LIST &KEY_TABLE_DEFINITION(qwerty), &KEY_TABLE_DEFINITION(edge), &KEY_TABLE_DEFINITION(sync), + &KEY_TABLE_DEFINITION(beetle), END_KEY_TABLE_LIST typedef enum { @@ -183,7 +201,12 @@ static const IdentityEntry scrollIdentity = { .keyTable = &KEY_TABLE_DEFINITION(scroll) }; -static const IdentityEntry qwertyIdentity = { +static const IdentityEntry qwerty2Identity = { + .id1 = 0X53, .id2 = 0X58, + .keyTable = &KEY_TABLE_DEFINITION(qwerty) +}; + +static const IdentityEntry qwerty1Identity = { .id1 = 0X51, .id2 = 0X58, .keyTable = &KEY_TABLE_DEFINITION(qwerty) }; @@ -327,7 +350,8 @@ testIdentities (BrailleDisplay *brl, const IdentityEntry *const *identities) { static const KeyTableDefinition * testBrailleSenseIdentities (BrailleDisplay *brl) { static const IdentityEntry *const identities[] = { - &qwertyIdentity, + &qwerty2Identity, + &qwerty1Identity, &scrollIdentity, &panIdentity, NULL @@ -510,6 +534,21 @@ getCellCount (BrailleDisplay *brl, unsigned int *count) { return brl->data->protocol->getDefaultCellCount(brl, count); } +static void +setKeyTable (BrailleDisplay *brl, const KeyTableDefinition *ktd) { + if (!ktd) ktd = brl->data->protocol->keyTable; + + switch (brl->textColumns) { + case 14: + if (ktd == &KEY_TABLE_DEFINITION(scroll)) { + ktd = &KEY_TABLE_DEFINITION(beetle); + } + break; + } + + setBrailleKeyTable(brl, ktd); +} + static int connectResource (BrailleDisplay *brl, const char *identifier) { static const SerialParameters serialParameters = { @@ -614,19 +653,15 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { logMessage(LOG_INFO, "detected: %s", brl->data->protocol->modelName); - { - const KeyTableDefinition *ktd = - brl->data->protocol->testIdentities? - brl->data->protocol->testIdentities(brl): - NULL; - - if (!ktd) ktd = brl->data->protocol->keyTable; - setBrailleKeyTable(brl, ktd); - } + const KeyTableDefinition *ktd = + brl->data->protocol->testIdentities? + brl->data->protocol->testIdentities(brl): + NULL; if (getCellCount(brl, &brl->textColumns)) { brl->textRows = 1; + setKeyTable(brl, ktd); makeOutputTable(dotsTable_ISO11548_1); if (clearCells(brl)) return 1; diff --git a/Drivers/Braille/HIMS/brldefs-hm.h b/Drivers/Braille/HIMS/brldefs-hm.h index c38ba2da1b4575d0f1123858d40584ae916cbfc0..221a378b6fb85cd909f3a2e1e1ddd0859e0ee90e 100644 --- a/Drivers/Braille/HIMS/brldefs-hm.h +++ b/Drivers/Braille/HIMS/brldefs-hm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/HandyTech/Makefile.in b/Drivers/Braille/HandyTech/Makefile.in index d0d99f4f4d5bf6524828e9fbd1edf451e072394b..aa40019d5745c2eb28360cec980fc1a6c853ff6e 100644 --- a/Drivers/Braille/HandyTech/Makefile.in +++ b/Drivers/Braille/HandyTech/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c index bd120ba0c10ccedd5b84d568ea5ef58a94d5b41a..967485baf57736f6dbe97abbb88b53f34139fff5 100644 --- a/Drivers/Braille/HandyTech/braille.c +++ b/Drivers/Braille/HandyTech/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -868,8 +868,9 @@ verifyPacket ( break; } - if ((size == *length) && (bytes[0] == HT_PKT_Extended) && (byte != SYN)) + if ((size == *length) && (bytes[0] == HT_PKT_Extended) && (byte != SYN)) { return BRL_PVR_INVALID; + } return BRL_PVR_INCLUDE; } @@ -1252,10 +1253,12 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { unsigned int setTime = 0; HT_Packet response; - if (*parameters[PARM_SETTIME]) - if (!validateYesNo(&setTime, parameters[PARM_SETTIME])) + if (*parameters[PARM_SETTIME]) { + if (!validateYesNo(&setTime, parameters[PARM_SETTIME])) { logMessage(LOG_WARNING, "%s: %s", "invalid set time setting", parameters[PARM_SETTIME]); + } + } setTime = !!setTime; @@ -1347,11 +1350,7 @@ updateCells (BrailleDisplay *brl) { if (!brl->data->updateRequired) return 1; if (brl->data->currentState != BDS_READY) return 1; - if (!writeCells(brl)) { - setState(brl, BDS_OFF); - return 0; - } - + if (!writeCells(brl)) return 0; brl->data->updateRequired = 0; return 1; } @@ -1365,8 +1364,7 @@ brl_writeWindow (BrailleDisplay *brl, const wchar_t *text) { brl->data->updateRequired = 1; } - updateCells(brl); - return 1; + return updateCells(brl); } static int diff --git a/Drivers/Braille/HandyTech/brldefs-ht.h b/Drivers/Braille/HandyTech/brldefs-ht.h index 0897222b438901fce4dce488f31acdb6ec40ca6c..3b8bcad388a4930b513184967c3731cfae557bbb 100644 --- a/Drivers/Braille/HandyTech/brldefs-ht.h +++ b/Drivers/Braille/HandyTech/brldefs-ht.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -128,17 +128,17 @@ typedef union { unsigned char bytes[4 + 0XFF]; struct { - HT_PacketType type:8; + unsigned char type; union { struct { - HT_ModelIdentifier model:8; + unsigned char model; } PACKED ok; struct { - HT_ModelIdentifier model:8; + unsigned char model; unsigned char length; - HT_ExtendedPacketType type:8; + unsigned char type; union { HT_DateTime dateTime; diff --git a/Drivers/Braille/Hedo/Makefile.in b/Drivers/Braille/Hedo/Makefile.in index 5c13efcd9aa813cdaf2a57fa702a88cb521ab01d..1fbb7428f199b8849dcb1fa90d80935bbb705f29 100644 --- a/Drivers/Braille/Hedo/Makefile.in +++ b/Drivers/Braille/Hedo/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Hedo/braille.c b/Drivers/Braille/Hedo/braille.c index ecce1a1f760f507bf85a4fc799a74b4f37679e13..2e0d0d63c9dee684136a3d3436b1c1dcb0987e5f 100644 --- a/Drivers/Braille/Hedo/braille.c +++ b/Drivers/Braille/Hedo/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Hedo/brldefs-hd.h b/Drivers/Braille/Hedo/brldefs-hd.h index b12b2bfc29a37f3cf5248de7653b3b2b988c4ce3..8f007216fa1a2b09e88d358892633afcb27b7477 100644 --- a/Drivers/Braille/Hedo/brldefs-hd.h +++ b/Drivers/Braille/Hedo/brldefs-hd.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/HumanWare/Makefile.in b/Drivers/Braille/HumanWare/Makefile.in index 911a4a17e1fa8bb4d39d99adba5442816ec5a520..632084ae6c67f8fb30ad12d319fb524ab79a4b17 100644 --- a/Drivers/Braille/HumanWare/Makefile.in +++ b/Drivers/Braille/HumanWare/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/HumanWare/braille.c b/Drivers/Braille/HumanWare/braille.c index fd72c159f28b596a017f668fa6c82fb01c38abbf..25b2b13a0b27438af3a91119d1088c3ccb603613 100644 --- a/Drivers/Braille/HumanWare/braille.c +++ b/Drivers/Braille/HumanWare/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -23,13 +23,31 @@ #include "log.h" #include "ascii.h" +#include "bitmask.h" +#include "async_wait.h" #include "brl_driver.h" #include "brldefs-hw.h" -BEGIN_KEY_NAME_TABLE(all) - KEY_NAME_ENTRY(HW_KEY_Power, "Power"), +BEGIN_KEY_NAME_TABLE(nav) + KEY_NAME_ENTRY(HW_KEY_Reset, "Reset"), + KEY_NAME_ENTRY(HW_KEY_Command1, "Display1"), + KEY_NAME_ENTRY(HW_KEY_Command2, "Display2"), + KEY_NAME_ENTRY(HW_KEY_Command3, "Display3"), + KEY_NAME_ENTRY(HW_KEY_Command4, "Display4"), + KEY_NAME_ENTRY(HW_KEY_Command5, "Display5"), + KEY_NAME_ENTRY(HW_KEY_Command6, "Display6"), + + KEY_NAME_ENTRY(HW_KEY_Thumb1, "Thumb1"), + KEY_NAME_ENTRY(HW_KEY_Thumb2, "Thumb2"), + KEY_NAME_ENTRY(HW_KEY_Thumb3, "Thumb3"), + KEY_NAME_ENTRY(HW_KEY_Thumb4, "Thumb4"), + + KEY_GROUP_ENTRY(HW_GRP_RoutingKeys, "RoutingKey"), +END_KEY_NAME_TABLE + +BEGIN_KEY_NAME_TABLE(kbd) KEY_NAME_ENTRY(HW_KEY_Dot1, "Dot1"), KEY_NAME_ENTRY(HW_KEY_Dot2, "Dot2"), KEY_NAME_ENTRY(HW_KEY_Dot3, "Dot3"), @@ -39,39 +57,199 @@ BEGIN_KEY_NAME_TABLE(all) KEY_NAME_ENTRY(HW_KEY_Dot7, "Dot7"), KEY_NAME_ENTRY(HW_KEY_Dot8, "Dot8"), KEY_NAME_ENTRY(HW_KEY_Space, "Space"), - - KEY_NAME_ENTRY(HW_KEY_Nav1, "Display1"), - KEY_NAME_ENTRY(HW_KEY_Nav2, "Display2"), - KEY_NAME_ENTRY(HW_KEY_Nav3, "Display3"), - KEY_NAME_ENTRY(HW_KEY_Nav4, "Display4"), - KEY_NAME_ENTRY(HW_KEY_Nav5, "Display5"), - KEY_NAME_ENTRY(HW_KEY_Nav6, "Display6"), - - KEY_NAME_ENTRY(HW_KEY_Thumb1, "Thumb1"), - KEY_NAME_ENTRY(HW_KEY_Thumb2, "Thumb2"), - KEY_NAME_ENTRY(HW_KEY_Thumb3, "Thumb3"), - KEY_NAME_ENTRY(HW_KEY_Thumb4, "Thumb4"), - - KEY_GROUP_ENTRY(HW_GRP_RoutingKeys, "RoutingKey"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLES(all) - KEY_NAME_TABLE(all), +BEGIN_KEY_NAME_TABLES(mb1) + KEY_NAME_TABLE(nav), END_KEY_NAME_TABLES -DEFINE_KEY_TABLE(all) +BEGIN_KEY_NAME_TABLES(mb2) + KEY_NAME_TABLE(nav), + KEY_NAME_TABLE(kbd), +END_KEY_NAME_TABLES + +DEFINE_KEY_TABLE(mb1) +DEFINE_KEY_TABLE(mb2) BEGIN_KEY_TABLE_LIST - &KEY_TABLE_DEFINITION(all), + &KEY_TABLE_DEFINITION(mb1), + &KEY_TABLE_DEFINITION(mb2), END_KEY_TABLE_LIST +#define OPEN_READY_DELAY 100 + +#define SERIAL_PROBE_RESPONSE_TIMEOUT 1000 +#define SERIAL_PROBE_RETRY_LIMIT 0 + +#define SERIAL_INIT_RESEND_DELAY 100 +#define SERIAL_INIT_RESEND_LIMIT 10 + +#define MAXIMUM_TEXT_CELL_COUNT 0XFF + +#define MAXIMUM_KEY_VALUE 0XFF +#define KEYS_BITMASK(name) BITMASK(name, (MAXIMUM_KEY_VALUE + 1), int) + +#define BRAILLE_KEY_COUNT (8 + 1) +#define COMMAND_KEY_COUNT 6 +#define THUMB_KEY_COUNT 4 + +typedef struct { + const char *name; + int (*probeDisplay) (BrailleDisplay *brl); + int (*writeCells) (BrailleDisplay *brl, const unsigned char *cells, unsigned char count); + int (*processInputPacket) (BrailleDisplay *brl); + int (*keepAwake) (BrailleDisplay *brl); +} ProtocolEntry; + struct BrailleDataStruct { - unsigned char forceWrite; - unsigned char textCells[0XFF]; + const ProtocolEntry *protocol; + uint32_t firmwareVersion; + unsigned isOffline:1; + + struct { + unsigned char count; + KEYS_BITMASK(mask); + } pressedKeys; + + struct { + unsigned char rewrite; + unsigned char cells[MAXIMUM_TEXT_CELL_COUNT]; + } text; + + struct { + struct { + unsigned char resendCount; + } init; + } serial; + + struct { + struct { + unsigned char reportSize; + } pressedKeys; + } hid; }; +static int +getDecimalValue (const char *digits, unsigned int count) { + unsigned int result = 0; + + const char zero = '0'; + const char nine = '9'; + + const char *digit = digits; + const char *end = digit + count; + + while (digit < end) { + if (*digit < zero) return 0; + if (*digit > nine) return 0; + + result *= 10; + result += *digit++ - zero; + } + + return result; +} + +static void +setFirmwareVersion (BrailleDisplay *brl, unsigned char major, unsigned char minor, unsigned char build) { + logMessage(LOG_INFO, "Firmware Version: %u.%u.%u", major, minor, build); + brl->data->firmwareVersion = (major << 16) | (minor << 8) << (build << 0); +} + +static int +hasBrailleKeyboard (BrailleDisplay *brl) { + if (brl->textColumns == 32) return 1; + if (brl->textColumns == 40) return 1; + return 0; +} + +static int +hasSecondThumbKeys (BrailleDisplay *brl) { + if (brl->textColumns == 80) return 1; + return 0; +} + +static int +handleKeyEvent (BrailleDisplay *brl, unsigned char key, int press) { + KeyGroup group; + + if (key < HW_KEY_ROUTING) { + group = HW_GRP_NavigationKeys; + } else { + group = HW_GRP_RoutingKeys; + key -= HW_KEY_ROUTING; + } + + return enqueueKeyEvent(brl, group, key, press); +} + +static int +handleKeyPress (BrailleDisplay *brl, unsigned char key) { + if (BITMASK_TEST(brl->data->pressedKeys.mask, key)) return 0; + + BITMASK_SET(brl->data->pressedKeys.mask, key); + brl->data->pressedKeys.count += 1; + + handleKeyEvent(brl, key, 1); + return 1; +} + +static int +handleKeyRelease (BrailleDisplay *brl, unsigned char key) { + if (!BITMASK_TEST(brl->data->pressedKeys.mask, key)) return 0; + + BITMASK_CLEAR(brl->data->pressedKeys.mask, key); + brl->data->pressedKeys.count -= 1; + + handleKeyEvent(brl, key, 0); + return 1; +} + +static void +handlePressedKeysArray (BrailleDisplay *brl, unsigned char *keys, size_t count) { + KEYS_BITMASK(pressedMask); + BITMASK_ZERO(pressedMask); + unsigned int pressedCount = 0; + + { + const unsigned char *key = keys; + const unsigned char *end = keys + count; + + while (key < end) { + if (!*key) break; + + if (!BITMASK_TEST(pressedMask, *key)) { + BITMASK_SET(pressedMask, *key); + pressedCount += 1; + + handleKeyPress(brl, *key); + } + + key += 1; + } + } + + if (brl->data->pressedKeys.count > pressedCount) { + for (unsigned int key=0; key<=MAXIMUM_KEY_VALUE; key+=1) { + if (!BITMASK_TEST(pressedMask, key)) { + if (handleKeyRelease(brl, key)) { + if (brl->data->pressedKeys.count == pressedCount) { + break; + } + } + } + } + } +} + +static void +handlePoweringOff (BrailleDisplay *brl) { + logMessage(LOG_CATEGORY(BRAILLE_DRIVER), "powering off"); + brl->data->isOffline = 1; +} + static BraillePacketVerifierResult -verifyPacket ( +verifySerialPacket ( BrailleDisplay *brl, const unsigned char *bytes, size_t size, size_t *length, void *data @@ -95,8 +273,13 @@ verifyPacket ( return BRL_PVR_INCLUDE; } +static size_t +readSerialPacket (BrailleDisplay *brl, void *buffer, size_t size) { + return readBraillePacket(brl, NULL, buffer, size, verifySerialPacket, NULL); +} + static int -writePacket (BrailleDisplay *brl, unsigned char type, unsigned char length, const void *data) { +writeSerialPacket (BrailleDisplay *brl, unsigned char type, unsigned char length, const void *data) { HW_Packet packet; packet.fields.header = ESC; @@ -109,6 +292,300 @@ writePacket (BrailleDisplay *brl, unsigned char type, unsigned char length, cons return writeBraillePacket(brl, NULL, &packet, length); } +static int +writeSerialRequest (BrailleDisplay *brl, unsigned char type) { + return writeSerialPacket(brl, type, 0, NULL); +} + +static int +writeSerialIdentifyRequest (BrailleDisplay *brl) { + return writeSerialRequest(brl, HW_MSG_INIT); +} + +static size_t +readSerialResponse (BrailleDisplay *brl, void *packet, size_t size) { + return readSerialPacket(brl, packet, size); +} + +static BrailleResponseResult +isSerialIdentityResponse (BrailleDisplay *brl, const void *packet, size_t size) { + const HW_Packet *response = packet; + + if (response->fields.type != HW_MSG_INIT_RESP) return BRL_RSP_UNEXPECTED; + if (!response->fields.data.init.stillInitializing) return BRL_RSP_DONE; + + if (++brl->data->serial.init.resendCount > SERIAL_INIT_RESEND_LIMIT) { + logMessage(LOG_CATEGORY(BRAILLE_DRIVER), "channel initialization timeout"); + return BRL_RSP_FAIL; + } + + logMessage(LOG_CATEGORY(BRAILLE_DRIVER), "channel still initializing"); + asyncWait(SERIAL_INIT_RESEND_DELAY); + + if (writeSerialIdentifyRequest(brl)) return BRL_RSP_CONTINUE; + return BRL_RSP_FAIL; +} + +static int +probeSerialDisplay (BrailleDisplay *brl) { + HW_Packet response; + + brl->data->serial.init.resendCount = 0; + + if (probeBrailleDisplay(brl, SERIAL_PROBE_RETRY_LIMIT, + NULL, SERIAL_PROBE_RESPONSE_TIMEOUT, + writeSerialIdentifyRequest, + readSerialResponse, &response, sizeof(response.bytes), + isSerialIdentityResponse)) { + logMessage(LOG_INFO, "detected Humanware device: model=%u cells=%u", + response.fields.data.init.modelIdentifier, + response.fields.data.init.cellCount); + + brl->textColumns = response.fields.data.init.cellCount; + + writeSerialRequest(brl, HW_MSG_GET_FIRMWARE_VERSION); + writeSerialRequest(brl, HW_MSG_GET_KEYS); + + return 1; + } + + return 0; +} + +static int +writeSerialCells (BrailleDisplay *brl, const unsigned char *cells, unsigned char count) { + return writeSerialPacket(brl, HW_MSG_DISPLAY, count, cells); +} + +static int +processSerialInputPacket (BrailleDisplay *brl) { + HW_Packet packet; + size_t length = readSerialPacket(brl, &packet, sizeof(packet)); + if (!length) return 0; + brl->data->isOffline = 0; + + switch (packet.fields.type) { + case HW_MSG_KEYS: + handlePressedKeysArray(brl, packet.fields.data.bytes, packet.fields.length); + break; + + case HW_MSG_KEY_DOWN: + handleKeyPress(brl, packet.fields.data.key.id); + break; + + case HW_MSG_KEY_UP: + handleKeyRelease(brl, packet.fields.data.key.id); + break; + + case HW_MSG_FIRMWARE_VERSION_RESP: + setFirmwareVersion(brl, + packet.fields.data.firmwareVersion.major, + packet.fields.data.firmwareVersion.minor, + packet.fields.data.firmwareVersion.build); + break; + + case HW_MSG_KEEP_AWAKE_RESP: + break; + + case HW_MSG_POWERING_OFF: + handlePoweringOff(brl); + break; + + default: + logUnexpectedPacket(&packet, length); + break; + } + + return 1; +} + +static int +keepSerialAwake (BrailleDisplay *brl) { + return writeSerialRequest(brl, HW_MSG_KEEP_AWAKE); +} + +static const ProtocolEntry serialProtocol = { + .name = "serial", + .probeDisplay = probeSerialDisplay, + .writeCells = writeSerialCells, + .processInputPacket = processSerialInputPacket, + .keepAwake = keepSerialAwake +}; + +static ssize_t +readHidFeature ( + BrailleDisplay *brl, unsigned char report, + unsigned char *buffer, size_t size +) { + if (size > 0) *buffer = 0; + ssize_t length = gioGetHidFeature(brl->gioEndpoint, report, buffer, size); + + if (length != -1) { + if ((length > 0) && (*buffer == report)) { + logInputPacket(buffer, length); + return length; + } + + errno = EAGAIN; + } + + logSystemError("USB HID feature read"); + return -1; +} + +static int +writeHidReport (BrailleDisplay *brl, const void *data, size_t size) { + logOutputPacket(data, size); + + { + ssize_t result = gioWriteHidReport(brl->gioEndpoint, data, size); + if (result != -1) return 1; + } + + logSystemError("HID report write"); + return 0; +} + +static BraillePacketVerifierResult +verifyHidPacket ( + BrailleDisplay *brl, + const unsigned char *bytes, size_t size, + size_t *length, void *data +) { + unsigned char byte = bytes[size-1]; + + switch (size) { + case 1: + switch (byte) { + case HW_REP_FTR_Capabilities: + *length = sizeof(HW_CapabilitiesReport); + break; + + case HW_REP_FTR_Settings: + *length = sizeof(HW_SettingsReport); + break; + + case HW_REP_FTR_Configuration: + *length = sizeof(HW_ConfigurationReport); + break; + + case HW_REP_IN_PressedKeys: + *length = brl->data->hid.pressedKeys.reportSize; + break; + + case HW_REP_FTR_KeepAwake: + *length = sizeof(HW_KeepAwakeReport); + break; + + case HW_REP_IN_PoweringOff: + *length = sizeof(HW_PoweringOffReport); + break; + + default: + return BRL_PVR_INVALID; + } + break; + + default: + break; + } + + return BRL_PVR_INCLUDE; +} + +static size_t +readHidPacket (BrailleDisplay *brl, void *buffer, size_t size) { + return readBraillePacket(brl, NULL, buffer, size, verifyHidPacket, NULL); +} + +static int +probeHidDisplay (BrailleDisplay *brl) { + HW_CapabilitiesReport capabilities; + unsigned char *const buffer = (unsigned char *)&capabilities; + const size_t size = sizeof(capabilities); + + ssize_t length = readHidFeature(brl, HW_REP_FTR_Capabilities, buffer, size); + if (length == -1) return 0; + memset(&buffer[length], 0, (size - length)); + + setFirmwareVersion(brl, + getDecimalValue(&capabilities.version.major, 1), + getDecimalValue(&capabilities.version.minor, 1), + getDecimalValue(&capabilities.version.build[0], 2)); + + brl->textColumns = capabilities.cellCount; + + { + unsigned char *size = &brl->data->hid.pressedKeys.reportSize; + *size = 1 + THUMB_KEY_COUNT + COMMAND_KEY_COUNT + brl->textColumns; + if (hasBrailleKeyboard(brl)) *size += BRAILLE_KEY_COUNT; + if (hasSecondThumbKeys(brl)) *size += THUMB_KEY_COUNT; + } + + return 1; +} + +static int +writeHidCells (BrailleDisplay *brl, const unsigned char *cells, unsigned char count) { + unsigned char buffer[4 + count]; + unsigned char *byte = buffer; + + *byte++ = HW_REP_OUT_WriteCells; + *byte++ = 1; + *byte++ = 0; + *byte++ = count; + byte = mempcpy(byte, cells, count); + + return writeHidReport(brl, buffer, byte-buffer); +} + +static int +processHidInputPacket (BrailleDisplay *brl) { + unsigned char packet[0XFF]; + size_t length = readHidPacket(brl, packet, sizeof(packet)); + if (!length) return 0; + brl->data->isOffline = 0; + + switch (packet[0]) { + case HW_REP_IN_PressedKeys: { + const unsigned int offset = 1; + + handlePressedKeysArray(brl, packet+offset, length-offset); + break; + } + + case HW_REP_IN_PoweringOff: + handlePoweringOff(brl); + break; + + default: + logUnexpectedPacket(packet, length); + case HW_REP_FTR_Settings: + case HW_REP_FTR_Configuration: + break; + } + + return 1; +} + +static int +keepHidAwake (BrailleDisplay *brl) { + HW_KeepAwakeReport report; + + memset(&report, 0, sizeof(report)); + report.reportIdentifier = HW_REP_FTR_KeepAwake; + + return writeHidReport(brl, &report, sizeof(report));; +} + +static const ProtocolEntry hidProtocol = { + .name = "HID", + .probeDisplay = probeHidDisplay, + .writeCells = writeHidCells, + .processInputPacket = processHidInputPacket, + .keepAwake = keepHidAwake +}; + static int connectResource (BrailleDisplay *brl, const char *identifier) { static const SerialParameters serialParameters = { @@ -118,11 +595,19 @@ connectResource (BrailleDisplay *brl, const char *identifier) { }; BEGIN_USB_CHANNEL_DEFINITIONS - { /* all models */ + { /* all models (serial protocol) */ .vendor=0X1C71, .product=0XC005, .configuration=1, .interface=1, .alternative=0, .inputEndpoint=2, .outputEndpoint=3, - .serial = &serialParameters + .serial = &serialParameters, + .data = &serialProtocol + }, + + { /* all models (HID protocol) */ + .vendor=0X1C71, .product=0XC006, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=1, + .data = &hidProtocol }, END_USB_CHANNEL_DEFINITIONS @@ -130,35 +615,27 @@ connectResource (BrailleDisplay *brl, const char *identifier) { gioInitializeDescriptor(&descriptor); descriptor.serial.parameters = &serialParameters; - descriptor.serial.options.readyDelay = 100; + descriptor.serial.options.applicationData = &serialProtocol; + descriptor.serial.options.readyDelay = OPEN_READY_DELAY; descriptor.usb.channelDefinitions = usbChannelDefinitions; + descriptor.usb.options.readyDelay = OPEN_READY_DELAY; descriptor.bluetooth.channelNumber = 1; - descriptor.bluetooth.options.readyDelay = 100; + descriptor.bluetooth.options.applicationData = &serialProtocol; + descriptor.bluetooth.options.readyDelay = OPEN_READY_DELAY; if (connectBrailleResource(brl, identifier, &descriptor, NULL)) { + brl->data->protocol = gioGetApplicationData(brl->gioEndpoint); return 1; } return 0; } -static int -writeIdentifyRequest (BrailleDisplay *brl) { - return writePacket(brl, HW_MSG_INIT, 0, NULL); -} - -static size_t -readResponse (BrailleDisplay *brl, void *packet, size_t size) { - return readBraillePacket(brl, NULL, packet, size, verifyPacket, NULL); -} - -static BrailleResponseResult -isIdentityResponse (BrailleDisplay *brl, const void *packet, size_t size) { - const HW_Packet *response = packet; - - return (response->fields.type == HW_MSG_INIT_RESP)? BRL_RSP_DONE: BRL_RSP_UNEXPECTED; +static void +disconnectResource (BrailleDisplay *brl) { + disconnectBrailleResource(brl, NULL); } static int @@ -167,31 +644,22 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { memset(brl->data, 0, sizeof(*brl->data)); if (connectResource(brl, device)) { - HW_Packet response; - - if (probeBrailleDisplay(brl, 0, NULL, 1000, - writeIdentifyRequest, - readResponse, &response, sizeof(response.bytes), - isIdentityResponse)) { - logMessage(LOG_INFO, "detected Humanware device: model=%u cells=%u", - response.fields.data.init.modelIdentifier, - response.fields.data.init.cellCount); - - if (response.fields.data.init.communicationDisabled) { - logMessage(LOG_WARNING, "communication channel not available"); + if (brl->data->protocol->probeDisplay(brl)) { + { + const KeyTableDefinition *ktd = + hasBrailleKeyboard(brl)? + &KEY_TABLE_DEFINITION(mb2): + &KEY_TABLE_DEFINITION(mb1); + + setBrailleKeyTable(brl, ktd); } - brl->textColumns = response.fields.data.init.cellCount; - brl->textRows = 1; - - setBrailleKeyTable(brl, &KEY_TABLE_DEFINITION(all)); makeOutputTable(dotsTable_ISO11548_1); - - brl->data->forceWrite = 1; + brl->data->text.rewrite = 1; return 1; } - disconnectBrailleResource(brl, NULL); + disconnectResource(brl); } free(brl->data); @@ -205,61 +673,28 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { static void brl_destruct (BrailleDisplay *brl) { - disconnectBrailleResource(brl, NULL); - - if (brl->data) { - free(brl->data); - brl->data = NULL; - } + disconnectResource(brl); + free(brl->data); } static int brl_writeWindow (BrailleDisplay *brl, const wchar_t *text) { - if (cellsHaveChanged(brl->data->textCells, brl->buffer, brl->textColumns, NULL, NULL, &brl->data->forceWrite)) { - unsigned char cells[brl->textColumns]; - - translateOutputCells(cells, brl->data->textCells, brl->textColumns); - if (!writePacket(brl, HW_MSG_DISPLAY, brl->textColumns, cells)) return 0; - } + const size_t count = brl->textColumns; - return 1; -} + if (cellsHaveChanged(brl->data->text.cells, brl->buffer, count, NULL, NULL, &brl->data->text.rewrite)) { + unsigned char cells[count]; -static void -handleKeyEvent (BrailleDisplay *brl, unsigned char key, int press) { - KeyGroup group; - - if (key < HW_KEY_ROUTING) { - group = HW_GRP_NavigationKeys; - } else { - group = HW_GRP_RoutingKeys; - key -= HW_KEY_ROUTING; + translateOutputCells(cells, brl->data->text.cells, count); + if (!brl->data->protocol->writeCells(brl, cells, count)) return 0; } - enqueueKeyEvent(brl, group, key, press); + return 1; } static int brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) { - HW_Packet packet; - size_t length; - - while ((length = readBraillePacket(brl, NULL, &packet, sizeof(packet), verifyPacket, NULL))) { - switch (packet.fields.type) { - case HW_MSG_KEY_DOWN: - handleKeyEvent(brl, packet.fields.data.key.id, 1); - continue; - - case HW_MSG_KEY_UP: - handleKeyEvent(brl, packet.fields.data.key.id, 0); - continue; - - default: - break; - } - - logUnexpectedPacket(&packet, length); - } - - return (errno == EAGAIN)? EOF: BRL_CMD_RESTARTBRL; + while (brl->data->protocol->processInputPacket(brl)); + if (errno != EAGAIN) return BRL_CMD_RESTARTBRL; + if (brl->data->isOffline) return BRL_CMD_OFFLINE; + return EOF; } diff --git a/Drivers/Braille/HumanWare/brldefs-hw.h b/Drivers/Braille/HumanWare/brldefs-hw.h index 814e73ddaca7d6839433b5215f2675ff2e6eb0be..5cdf8b8c8a4163066e75907e0c1d35f33a0ebeac 100644 --- a/Drivers/Braille/HumanWare/brldefs-hw.h +++ b/Drivers/Braille/HumanWare/brldefs-hw.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -20,18 +20,23 @@ #define BRLTTY_INCLUDED_HW_BRLDEFS typedef enum { - HW_MSG_INIT = 0X00, - HW_MSG_INIT_RESP = 0X01, - HW_MSG_DISPLAY = 0X02, - HW_MSG_GET_KEYS = 0X03, - HW_MSG_KEYS = 0X04, - HW_MSG_KEY_DOWN = 0X05, - HW_MSG_KEY_UP = 0X06, - HW_MSG_FIRMWARE_UPDATE = 0X07, - HW_MSG_FIRMWARE_RESP = 0X08, - HW_MSG_CONFIGURATION_UPDATE = 0X09, - HW_MSG_CONFIGURATION_RESP = 0X0A, - HW_MSG_GET_CONFIGURATION = 0X0B + HW_MSG_INIT = 0X00, + HW_MSG_INIT_RESP = 0X01, + HW_MSG_DISPLAY = 0X02, + HW_MSG_GET_KEYS = 0X03, + HW_MSG_KEYS = 0X04, + HW_MSG_KEY_DOWN = 0X05, + HW_MSG_KEY_UP = 0X06, + HW_MSG_FIRMWARE_UPDATE = 0X07, + HW_MSG_FIRMWARE_RESP = 0X08, + HW_MSG_CONFIGURATION_UPDATE = 0X09, + HW_MSG_CONFIGURATION_RESP = 0X0A, + HW_MSG_GET_CONFIGURATION = 0X0B, + HW_MSG_GET_FIRMWARE_VERSION = 0X0C, + HW_MSG_FIRMWARE_VERSION_RESP = 0X0D, + HW_MSG_KEEP_AWAKE = 0X0E, + HW_MSG_KEEP_AWAKE_RESP = 0X0F, + HW_MSG_POWERING_OFF = 0X10 } HW_MessageType; typedef union { @@ -46,7 +51,7 @@ typedef union { unsigned char bytes[0XFF]; struct { - unsigned char communicationDisabled; + unsigned char stillInitializing; unsigned char modelIdentifier; unsigned char cellCount; } PACKED init; @@ -54,36 +59,102 @@ typedef union { struct { unsigned char id; } PACKED key; + + struct { + unsigned char have; + unsigned char major; + unsigned char minor; + unsigned char build; + } PACKED firmwareVersion; } data; } PACKED fields; } HW_Packet; typedef enum { - HW_KEY_Power = 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_Nav1 = 11, - HW_KEY_Nav2 = 12, - HW_KEY_Nav3 = 13, - HW_KEY_Nav4 = 14, - HW_KEY_Nav5 = 15, - HW_KEY_Nav6 = 16, - - HW_KEY_Thumb1 = 17, - HW_KEY_Thumb2 = 18, - HW_KEY_Thumb3 = 19, - HW_KEY_Thumb4 = 20, - - HW_KEY_ROUTING = 80 + HW_REP_FTR_Capabilities = 1, + HW_REP_FTR_Settings = 2, + HW_REP_FTR_Configuration = 3, + HW_REP_IN_PressedKeys = 4, + HW_REP_OUT_WriteCells = 5, + HW_REP_FTR_KeepAwake = 6, + HW_REP_IN_PoweringOff = 7 +} HW_ReportIdentifier; + +typedef struct { + unsigned char reportIdentifier; + char systemLanguage[2]; + + struct { + char major; + char minor; + char build[2]; + } version; + + char serialNumber[16]; + unsigned char zero; + unsigned char cellCount; + unsigned char cellType; + unsigned char pad[13]; +} HW_CapabilitiesReport; + +typedef struct { + unsigned char reportIdentifier; + unsigned char dotPressure; +} HW_SettingsReport; + +typedef struct { + unsigned char reportIdentifier; + unsigned char fill1; + unsigned char fill2; + unsigned char cellCount; + + struct { + unsigned char firstIndex; + unsigned char lastIndex; + } primaryRoutingKeys; + + struct { + unsigned char firstIndex; + unsigned char lastIndex; + } secondaryRoutingKeys; +} HW_ConfigurationReport; + +typedef struct { + unsigned char reportIdentifier; + unsigned char fill; +} HW_KeepAwakeReport; + +typedef struct { + unsigned char reportIdentifier; + unsigned char fill; +} HW_PoweringOffReport; + +typedef enum { + 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_ROUTING = 80 } HW_NavigationKey; typedef enum { diff --git a/Drivers/Braille/HumanWare/reldeps.mk b/Drivers/Braille/HumanWare/reldeps.mk index 346c757208aad6a02cdb5149ee9efd190bccead0..1eb8339156d6ab36421dd2828fe32d6ad94f2061 100644 --- a/Drivers/Braille/HumanWare/reldeps.mk +++ b/Drivers/Braille/HumanWare/reldeps.mk @@ -5,8 +5,10 @@ braille.$O: $(BLD_TOP)config.h braille.$O: $(BLD_TOP)forbuild.h braille.$O: $(SRC_TOP)Headers/log.h braille.$O: $(SRC_TOP)Headers/ascii.h -braille.$O: $(SRC_TOP)Headers/api_types.h +braille.$O: $(SRC_TOP)Headers/bitmask.h braille.$O: $(SRC_TOP)Headers/async.h +braille.$O: $(SRC_TOP)Headers/async_wait.h +braille.$O: $(SRC_TOP)Headers/api_types.h braille.$O: $(SRC_TOP)Headers/async_io.h braille.$O: $(SRC_TOP)Headers/brl_base.h braille.$O: $(SRC_TOP)Headers/brl_cmds.h diff --git a/Drivers/Braille/Iris/Makefile.in b/Drivers/Braille/Iris/Makefile.in index 3447afb164652b0f14331349aa01d009c76e9302..61e4bafae1db966bf3b8d73073c52001b8093002 100644 --- a/Drivers/Braille/Iris/Makefile.in +++ b/Drivers/Braille/Iris/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Iris/braille.c b/Drivers/Braille/Iris/braille.c index fd1ff6184ad2e4603b015e9fa0e6695a7ff78c77..178360486681b7660a397429db8b69664536ad06 100644 --- a/Drivers/Braille/Iris/braille.c +++ b/Drivers/Braille/Iris/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Iris/brldefs-ir.h b/Drivers/Braille/Iris/brldefs-ir.h index 87568c7177ac0988e98714d25e6ec4b6c492e89a..f4005ec7d0392afd93f4af2798bde641550e5183 100644 --- a/Drivers/Braille/Iris/brldefs-ir.h +++ b/Drivers/Braille/Iris/brldefs-ir.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Libbraille/Makefile.in b/Drivers/Braille/Libbraille/Makefile.in index acfd8c63ac880cb9d9619234e1667131990c16ac..5238323ff740fb96288729b9283a4e6471dd5065 100644 --- a/Drivers/Braille/Libbraille/Makefile.in +++ b/Drivers/Braille/Libbraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Libbraille/braille.c b/Drivers/Braille/Libbraille/braille.c index 9d145d19cf767510ece9d0569df02cbe8e8f403f..e6523bf0fe92981e73ee291c0de44604f20873b9 100644 --- a/Drivers/Braille/Libbraille/braille.c +++ b/Drivers/Braille/Libbraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/LogText/Makefile.in b/Drivers/Braille/LogText/Makefile.in index b63b0a077505b45e8a9936b9805e013c6c90e139..6b3857159fd468e660d0b984a1997f2cd3a08df8 100644 --- a/Drivers/Braille/LogText/Makefile.in +++ b/Drivers/Braille/LogText/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/LogText/braille.c b/Drivers/Braille/LogText/braille.c index 4d2d8b04a24cd52a65d6811f758b1b9a88598ae5..1081714671b7621117a9333e546a9330b32b7b0c 100644 --- a/Drivers/Braille/LogText/braille.c +++ b/Drivers/Braille/LogText/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/LogText/braille.h b/Drivers/Braille/LogText/braille.h index 959fcbe055d68f87e369790fde47a5be4a375324..80415ed23f688118bb1bc8774304699905ad8f80 100644 --- a/Drivers/Braille/LogText/braille.h +++ b/Drivers/Braille/LogText/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/LogText/brl-out.h b/Drivers/Braille/LogText/brl-out.h index 15ee5b779a879f41499660428773e875d4af61cf..bb35ff6fa231660b436f5858a84bc3572a91868f 100644 --- a/Drivers/Braille/LogText/brl-out.h +++ b/Drivers/Braille/LogText/brl-out.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/MDV/Makefile.in b/Drivers/Braille/MDV/Makefile.in index 8d57adfd9a50ca3e6fc7b0fc63438c4787ad18e5..7768a18de6074f12a5492fb245c296d65723cdbd 100644 --- a/Drivers/Braille/MDV/Makefile.in +++ b/Drivers/Braille/MDV/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/MDV/braille.c b/Drivers/Braille/MDV/braille.c index a8c18cba1add05704196245e1fd6e17f853f5c67..3620d253ebc87bb33514711b21106384d28d0aad 100644 --- a/Drivers/Braille/MDV/braille.c +++ b/Drivers/Braille/MDV/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/MDV/brldefs-md.h b/Drivers/Braille/MDV/brldefs-md.h index 887cf7cb54ced3ac141a81269d4754b0e44986a0..e9d1d2e2897d76db6b52512ea9dd34509bd1be4c 100644 --- a/Drivers/Braille/MDV/brldefs-md.h +++ b/Drivers/Braille/MDV/brldefs-md.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Metec/Makefile.in b/Drivers/Braille/Metec/Makefile.in index a3b622c84eb9dbdc5f8f05119c5046fe32be89a5..f043a0b52b933791f92aba516db0e38349746ffb 100644 --- a/Drivers/Braille/Metec/Makefile.in +++ b/Drivers/Braille/Metec/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Metec/braille.c b/Drivers/Braille/Metec/braille.c index 59c66f589b9a71f108dbda66b236616978e7fe98..16b4fc3990798bf66ffb3a0f1f9617c8fb41b6be 100644 --- a/Drivers/Braille/Metec/braille.c +++ b/Drivers/Braille/Metec/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Metec/brldefs-mt.h b/Drivers/Braille/Metec/brldefs-mt.h index 16f2f1f7d1088d5f5c21e5854cb3867d3d6dde8d..b4eb17c6960118aa3ee3d9b9c86421a13a737b5a 100644 --- a/Drivers/Braille/Metec/brldefs-mt.h +++ b/Drivers/Braille/Metec/brldefs-mt.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/MiniBraille/Makefile.in b/Drivers/Braille/MiniBraille/Makefile.in index 93d095e4523d43c536c0195a66f47a6f6b77190b..ec7024dc6ac98182c0e148e77e357535fcf4a556 100644 --- a/Drivers/Braille/MiniBraille/Makefile.in +++ b/Drivers/Braille/MiniBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/MiniBraille/braille.c b/Drivers/Braille/MiniBraille/braille.c index 64b6e839101f4c934743c50ee0046c9167a74d3a..396387a6ba8bb79bf8513d55798fa8b0a1dc9f16 100644 --- a/Drivers/Braille/MiniBraille/braille.c +++ b/Drivers/Braille/MiniBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/MultiBraille/Makefile.in b/Drivers/Braille/MultiBraille/Makefile.in index 7229f6c360f16827751fa7d355b09b38ede36e20..e6d6a44cb334fe2068cde097f58f7f9a8f83ec3a 100644 --- a/Drivers/Braille/MultiBraille/Makefile.in +++ b/Drivers/Braille/MultiBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/MultiBraille/braille.c b/Drivers/Braille/MultiBraille/braille.c index abc5fe0efe5d9be069ed660a63ae1676b5cb1d1e..696ab5bbf3714bd15f856f0e802239bad8a4356a 100644 --- a/Drivers/Braille/MultiBraille/braille.c +++ b/Drivers/Braille/MultiBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/MultiBraille/braille.h b/Drivers/Braille/MultiBraille/braille.h index 3b49995a64fb754c39e01c335ecde27c43edef04..fa8b70962740a8c07f11e42e2bf032a97b3de6fd 100644 --- a/Drivers/Braille/MultiBraille/braille.h +++ b/Drivers/Braille/MultiBraille/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/MultiBraille/tables.h b/Drivers/Braille/MultiBraille/tables.h index b32f536db452eac95f345d1f20a3f09c139dbe1e..2616d311f9e229b93e9d023828598dd796ede142 100644 --- a/Drivers/Braille/MultiBraille/tables.h +++ b/Drivers/Braille/MultiBraille/tables.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/NinePoint/Makefile.in b/Drivers/Braille/NinePoint/Makefile.in index cbebe77ebf5a037fb5fddb3f3c23c65ab6d888af..b9179ca6fc71e5475f54acf84e22da85f72852f5 100644 --- a/Drivers/Braille/NinePoint/Makefile.in +++ b/Drivers/Braille/NinePoint/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/NinePoint/braille.c b/Drivers/Braille/NinePoint/braille.c index d58894da529b94ca34f2de7e2b76020ee9d8cc30..f7deda393ced521e940ac69d08c2ab4d58f9ddcd 100644 --- a/Drivers/Braille/NinePoint/braille.c +++ b/Drivers/Braille/NinePoint/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/NinePoint/brldefs-np.h b/Drivers/Braille/NinePoint/brldefs-np.h index d70a61e32e09c60ce0a70ea76b2064c017f30b61..74601a081a1164be49f67c0dfe720920c764e8dc 100644 --- a/Drivers/Braille/NinePoint/brldefs-np.h +++ b/Drivers/Braille/NinePoint/brldefs-np.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Papenmeier/Makefile.in b/Drivers/Braille/Papenmeier/Makefile.in index fa7fa347f81c80a6bf18d1e23a64570f963262f1..2acbe8cca616711b5997e02c24213e7b06c46cc4 100644 --- a/Drivers/Braille/Papenmeier/Makefile.in +++ b/Drivers/Braille/Papenmeier/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Papenmeier/braille.c b/Drivers/Braille/Papenmeier/braille.c index f116d20a0910f4d2d30736e3f78e9b6f05da240f..526b27a14348b692fb1cc71246edd68f43e4a342 100644 --- a/Drivers/Braille/Papenmeier/braille.c +++ b/Drivers/Braille/Papenmeier/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Papenmeier/brldefs-pm.h b/Drivers/Braille/Papenmeier/brldefs-pm.h index 5386ffd9a3c8523d42fa5b355deab6dacd89151d..e21e83cb9ccc5003de9045875150c45195734b6c 100644 --- a/Drivers/Braille/Papenmeier/brldefs-pm.h +++ b/Drivers/Braille/Papenmeier/brldefs-pm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Papenmeier/models.h b/Drivers/Braille/Papenmeier/models.h index 4f8a23d83fde37954c24ac44f5aa8e28338e659e..9fb1d3103ea605fd96b2d2b873ed1c8338c158aa 100644 --- a/Drivers/Braille/Papenmeier/models.h +++ b/Drivers/Braille/Papenmeier/models.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -487,17 +487,17 @@ static const ModelEntry modelTable[] = { PM_BAR(0, 0, 1, 1) }, - { PM_MODEL_IDENTITY(98, trio, "BrailleX Live 40", 2), + { PM_MODEL_IDENTITY(98, live, "BrailleX Live 40", 2), PM_CELL_COUNTS(40, 0), PM_BAR(0, 0, 1, 1) }, - { PM_MODEL_IDENTITY(99, trio, "BrailleX Live+ 40", 2), + { PM_MODEL_IDENTITY(99, live, "BrailleX Live+ 40", 2), PM_CELL_COUNTS(40, 0), PM_BAR(0, 0, 1, 1) }, - { PM_MODEL_IDENTITY(100, trio, "BrailleX Live 20", 2), + { PM_MODEL_IDENTITY(100, live, "BrailleX Live 20", 2), PM_CELL_COUNTS(20, 0), PM_BAR(0, 0, 1, 1) } diff --git a/Drivers/Braille/Pegasus/Makefile.in b/Drivers/Braille/Pegasus/Makefile.in index 582d254cc4a786d7d70e4ed51d966e5d9bc3376c..ac5c98baae9c2527124811053bc5b9e8b6ebf082 100644 --- a/Drivers/Braille/Pegasus/Makefile.in +++ b/Drivers/Braille/Pegasus/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Pegasus/braille.c b/Drivers/Braille/Pegasus/braille.c index f1c1f3db1e06c3e36ad5f1ed4139b540a2e22bab..03a435195cd490c65e038f69412b8a7e1986a7b3 100644 --- a/Drivers/Braille/Pegasus/braille.c +++ b/Drivers/Braille/Pegasus/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Pegasus/brldefs-pg.h b/Drivers/Braille/Pegasus/brldefs-pg.h index b818593bd71b8b047381c829f101ba473e0a4e90..647400fba39299d094b077f36c492fbc931fff7d 100644 --- a/Drivers/Braille/Pegasus/brldefs-pg.h +++ b/Drivers/Braille/Pegasus/brldefs-pg.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Seika/Makefile.in b/Drivers/Braille/Seika/Makefile.in index 7d7839bf78f663dc0194a590bc9d04b022717348..ec00afc302d66b2532ad6fc22d6cc79874f35848 100644 --- a/Drivers/Braille/Seika/Makefile.in +++ b/Drivers/Braille/Seika/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Seika/braille.c b/Drivers/Braille/Seika/braille.c index e5d73092d6027da1a250dd4882b322ebcc9101d2..0e361c5fce7cf53ec3dc67f51a12bcda9fce9c9f 100644 --- a/Drivers/Braille/Seika/braille.c +++ b/Drivers/Braille/Seika/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Seika/brldefs-sk.h b/Drivers/Braille/Seika/brldefs-sk.h index f1d4aa6dae1c86a46a5a88f57595ee59430fc280..84ebf4567fec44d236367cfacd172ffca2537a5d 100644 --- a/Drivers/Braille/Seika/brldefs-sk.h +++ b/Drivers/Braille/Seika/brldefs-sk.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Skeleton/Makefile.in b/Drivers/Braille/Skeleton/Makefile.in index 5e3e7790cbd2567de19c79ce3c906f22488893a9..1466cf021e91ebf1a41a3d65aeaaafe7af4d1804 100644 --- a/Drivers/Braille/Skeleton/Makefile.in +++ b/Drivers/Braille/Skeleton/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Skeleton/braille.c b/Drivers/Braille/Skeleton/braille.c index a5bc0ba381cfefa0cf29237d33f9a4850d041034..ffd27d632f8aadaa7635ebc2c8272861244e9f63 100644 --- a/Drivers/Braille/Skeleton/braille.c +++ b/Drivers/Braille/Skeleton/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Skeleton/brldefs-xx.h b/Drivers/Braille/Skeleton/brldefs-xx.h index 33ed8c5752ea9e0f0628c74e4bd37e4c49f250e8..2ec8f73d19be0bd2f75d4cca00e20813cc9af760 100644 --- a/Drivers/Braille/Skeleton/brldefs-xx.h +++ b/Drivers/Braille/Skeleton/brldefs-xx.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/TSI/Makefile.in b/Drivers/Braille/TSI/Makefile.in index e2e632c6c233a7c66609eb6c8c7c2c3804f913df..aae25cfe9799529c461a7b77a8d116e1cb18ae53 100644 --- a/Drivers/Braille/TSI/Makefile.in +++ b/Drivers/Braille/TSI/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/TSI/braille.c b/Drivers/Braille/TSI/braille.c index d4e7c1f81db02f59c5c362dc097a24118788dde9..337a2152fb829c9a084952c55c4e1cab22e8f2d4 100644 --- a/Drivers/Braille/TSI/braille.c +++ b/Drivers/Braille/TSI/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/TSI/braille.h b/Drivers/Braille/TSI/braille.h index 5602536938b3bbeaa54d60d6dba8c649f3ff25ac..f8a62de4286a28c897f1118af38b8d046c017f3a 100644 --- a/Drivers/Braille/TSI/braille.h +++ b/Drivers/Braille/TSI/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/TSI/brldefs-ts.h b/Drivers/Braille/TSI/brldefs-ts.h index 3fdf46ac93d964cfa334d643e1f2f250abaceb85..2e6ba351cfa2ec41ad0347b67f5b844a58af7f65 100644 --- a/Drivers/Braille/TSI/brldefs-ts.h +++ b/Drivers/Braille/TSI/brldefs-ts.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/TTY/Makefile.in b/Drivers/Braille/TTY/Makefile.in index 25fa07c9b7bd97d240bf3e1ad40b034efce64585..4652c9d843214fa5670a1d1b11a887b599d87085 100644 --- a/Drivers/Braille/TTY/Makefile.in +++ b/Drivers/Braille/TTY/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/TTY/braille.c b/Drivers/Braille/TTY/braille.c index e30237b877cd6e429b210c382192d37b73f7d490..cdb2242eae1f290303365b401d1c3a24b33de5f5 100644 --- a/Drivers/Braille/TTY/braille.c +++ b/Drivers/Braille/TTY/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/TTY/braille.h b/Drivers/Braille/TTY/braille.h index 7000df66ca8a21f86d84c3affb297f814bb8c6f7..a5f3c214940ab6021c93b62fc2ea055e6e6faf23 100644 --- a/Drivers/Braille/TTY/braille.h +++ b/Drivers/Braille/TTY/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/TechniBraille/Makefile.in b/Drivers/Braille/TechniBraille/Makefile.in index e0d1c8521063d9448f9e3fcc961ec71e28f587c1..53331b199e0ddaec71c01e98e22c946b47dc8c39 100644 --- a/Drivers/Braille/TechniBraille/Makefile.in +++ b/Drivers/Braille/TechniBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/TechniBraille/braille.c b/Drivers/Braille/TechniBraille/braille.c index 40fe0510864cf13475f36fd00e95baf96d4794ae..89026c1e0d37b9958d246c116f71f19035889a22 100644 --- a/Drivers/Braille/TechniBraille/braille.c +++ b/Drivers/Braille/TechniBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VideoBraille/Makefile.in b/Drivers/Braille/VideoBraille/Makefile.in index 4f1dfcd55cd21b01ac2b018e42146b2d1b60b16a..647754f14bf572a1dd06753ae5ac73f462da56f8 100644 --- a/Drivers/Braille/VideoBraille/Makefile.in +++ b/Drivers/Braille/VideoBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/VideoBraille/braille.c b/Drivers/Braille/VideoBraille/braille.c index 9f0859e82f2864f6f2d564994162eaf7e55a2c67..2a6b1392feccdb4044151755889ef0901504f5b1 100644 --- a/Drivers/Braille/VideoBraille/braille.c +++ b/Drivers/Braille/VideoBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VideoBraille/braille.h b/Drivers/Braille/VideoBraille/braille.h index c93fc5b182a9d1b2656edee667fbc83a67dc83f2..f48fb2a16146f36b86507d2205ebccf925b8671c 100644 --- a/Drivers/Braille/VideoBraille/braille.h +++ b/Drivers/Braille/VideoBraille/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Virtual/Makefile.in b/Drivers/Braille/Virtual/Makefile.in index 885afd2437c1bb63c580a8b6ab05b56a88f59764..1ecf48f49c9dc58d85eb1d90380abe9b935ccf49 100644 --- a/Drivers/Braille/Virtual/Makefile.in +++ b/Drivers/Braille/Virtual/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Virtual/braille.c b/Drivers/Braille/Virtual/braille.c index 6f13f19a968a7fbec82d35d72dddf404c5476ec2..6216ed36a4996c9fbb2d1836af325d61c679c5d7 100644 --- a/Drivers/Braille/Virtual/braille.c +++ b/Drivers/Braille/Virtual/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Virtual/braille.h b/Drivers/Braille/Virtual/braille.h index b6d709007939a989875272ae8e79386e1dd1b852..8f0b7e88bc12b1ad61a74a76362083d7231e4c0c 100644 --- a/Drivers/Braille/Virtual/braille.h +++ b/Drivers/Braille/Virtual/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VisioBraille/Makefile.in b/Drivers/Braille/VisioBraille/Makefile.in index 577cd653b36024b6c8d3dd80b24113704aa96226..0467083666eb5a72f368505d1f5b5a8e95077ddc 100644 --- a/Drivers/Braille/VisioBraille/Makefile.in +++ b/Drivers/Braille/VisioBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/VisioBraille/braille.c b/Drivers/Braille/VisioBraille/braille.c index c12b028c504ec78391170ff18e59175ff5beb961..805907c6075147d616e39f344de1c153fe2d05f9 100644 --- a/Drivers/Braille/VisioBraille/braille.c +++ b/Drivers/Braille/VisioBraille/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VisioBraille/braille.h b/Drivers/Braille/VisioBraille/braille.h index c1d29ee037ebd2f2ff182198aeec9505c5655abe..d3e197004dc9746003f3f69d16f59fdb058c5089 100644 --- a/Drivers/Braille/VisioBraille/braille.h +++ b/Drivers/Braille/VisioBraille/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VisioBraille/brl-out.h b/Drivers/Braille/VisioBraille/brl-out.h index 83e6618a95125ed7781832500aa12ecc1a6120f0..c3bc93654176dea56c06c144a5ec703b44b1f78f 100644 --- a/Drivers/Braille/VisioBraille/brl-out.h +++ b/Drivers/Braille/VisioBraille/brl-out.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VisioBraille/brldefs-vs.h b/Drivers/Braille/VisioBraille/brldefs-vs.h index 2bdeb496f8836b455dcb9d90ba908e356dadc6a5..4423df195f8c4f5b7ea11ed93bcfcbb327f5ef88 100644 --- a/Drivers/Braille/VisioBraille/brldefs-vs.h +++ b/Drivers/Braille/VisioBraille/brldefs-vs.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/VisioBraille/vstp.h b/Drivers/Braille/VisioBraille/vstp.h index 14c428f1ecce07c7956ad6045fd0a37b3f2d07a6..dfd182070310283350ffdf65a4ddca1a48a3f1d8 100644 --- a/Drivers/Braille/VisioBraille/vstp.h +++ b/Drivers/Braille/VisioBraille/vstp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 S&S + * Copyright (C) 2006-2016 S&S * Samuel Thibault * Sébastien Hinderer * diff --git a/Drivers/Braille/VisioBraille/vstp_main.c b/Drivers/Braille/VisioBraille/vstp_main.c index a4982e38badc70443d8ce438c8d44fbca4387425..6a4291ac8564ea10a4f6630cfcea74e4cd81c43b 100644 --- a/Drivers/Braille/VisioBraille/vstp_main.c +++ b/Drivers/Braille/VisioBraille/vstp_main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 S&S + * Copyright (C) 2006-2016 S&S * Samuel Thibault * Sébastien Hinderer * diff --git a/Drivers/Braille/VisioBraille/vstp_transfer.c b/Drivers/Braille/VisioBraille/vstp_transfer.c index d132e65370f548cb554b8d3681b2e084e8e71896..0b718144135ff9da41f17ee407883ea0763d3927 100644 --- a/Drivers/Braille/VisioBraille/vstp_transfer.c +++ b/Drivers/Braille/VisioBraille/vstp_transfer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 S&S + * Copyright (C) 2006-2016 S&S * Samuel Thibault * Sébastien Hinderer * diff --git a/Drivers/Braille/Voyager/Makefile.in b/Drivers/Braille/Voyager/Makefile.in index 4ef400b5b394b6fad00974d54d2c4c980e37a480..70642c3fb1e59515e9098fb62e42248201034218 100644 --- a/Drivers/Braille/Voyager/Makefile.in +++ b/Drivers/Braille/Voyager/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/Voyager/braille.c b/Drivers/Braille/Voyager/braille.c index 2f518a5e6bfa671721f54e73eede382b63801ad5..a2629de23732ffe36b3ebc007a69af965592921f 100644 --- a/Drivers/Braille/Voyager/braille.c +++ b/Drivers/Braille/Voyager/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/Voyager/brldefs-vo.h b/Drivers/Braille/Voyager/brldefs-vo.h index 8b30200e0388bf7541898ab058c84ab5c0a3f577..1f9aadf9f420f72fe87724605379c9fff371c80c 100644 --- a/Drivers/Braille/Voyager/brldefs-vo.h +++ b/Drivers/Braille/Voyager/brldefs-vo.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/XWindow/Makefile.in b/Drivers/Braille/XWindow/Makefile.in index 23ecee9ab8dd5161ae4f101a0d31627ecacd835d..6833da07b2277463acd67b47bf200334323b356c 100644 --- a/Drivers/Braille/XWindow/Makefile.in +++ b/Drivers/Braille/XWindow/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Braille/XWindow/braille.c b/Drivers/Braille/XWindow/braille.c index 26ca705f72b5ae24624ed3fe64fd9f0108835587..842f3b88a3bb102a14823435ddc6ba7e70da0870 100644 --- a/Drivers/Braille/XWindow/braille.c +++ b/Drivers/Braille/XWindow/braille.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -211,7 +211,7 @@ typedef enum { static int cols,lines; static int input; static char *model = "simple"; -static const char *fontname = "-*-clearlyu-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-unifont-*-r-*-*-17-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1"; +static const char *fontname = "-*-clearlyu-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-unifont-*-*-*-*-*-*-*-*-*-*-iso10646-1,-*-fixed-*-*-*-*-*-*-*-*-*-*-iso8859-1"; static int xtArgc = 1; static char *xtDefArgv[]= { "brltty", NULL }; static char **xtArgv = xtDefArgv; diff --git a/Drivers/Braille/XWindow/braille.h b/Drivers/Braille/XWindow/braille.h index 7000df66ca8a21f86d84c3affb297f814bb8c6f7..a5f3c214940ab6021c93b62fc2ea055e6e6faf23 100644 --- a/Drivers/Braille/XWindow/braille.h +++ b/Drivers/Braille/XWindow/braille.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/BrlAPI/WindowEyes/Makefile.in b/Drivers/BrlAPI/WindowEyes/Makefile.in index 8cfc5bb1d8fa9f1cd17deef35e2757900dbc3751..6d9062d0d65d7e332b7376e6fb8cbce66e118c2f 100644 --- a/Drivers/BrlAPI/WindowEyes/Makefile.in +++ b/Drivers/BrlAPI/WindowEyes/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/BrlAPI/WindowEyes/test.c b/Drivers/BrlAPI/WindowEyes/test.c index ae4d7ca866b5453006f90fa8e3fad433d1d6a1d1..68c1345fbe28d3e168f904d8f80723b078c05e52 100644 --- a/Drivers/BrlAPI/WindowEyes/test.c +++ b/Drivers/BrlAPI/WindowEyes/test.c @@ -2,7 +2,7 @@ * BRLTTY - 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-2015 by The BRLTTY Developers. + * Copyright (C) 2009-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/BrlAPI/WindowEyes/webrloem.c b/Drivers/BrlAPI/WindowEyes/webrloem.c index 7b8684982345221e1096d563730919300bf8cf22..ce8b04879db81d712fd9ce03a0859289454ac8ea 100644 --- a/Drivers/BrlAPI/WindowEyes/webrloem.c +++ b/Drivers/BrlAPI/WindowEyes/webrloem.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/BrlAPI/WindowEyes/webrloem.h b/Drivers/BrlAPI/WindowEyes/webrloem.h index 7c0ba835ac03336ab4fefc121b03b8fea7f68dd4..73e92385f7df6bbd9912b8b4722279e61bae4151 100644 --- a/Drivers/BrlAPI/WindowEyes/webrloem.h +++ b/Drivers/BrlAPI/WindowEyes/webrloem.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Android/Makefile.in b/Drivers/Screen/Android/Makefile.in index f3904cde7fd86076d1308c5589a0f092c99a80b9..a8196efd37161749cdb2f44d78cd49f5d6fb2c30 100644 --- a/Drivers/Screen/Android/Makefile.in +++ b/Drivers/Screen/Android/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2012 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Android/screen.c b/Drivers/Screen/Android/screen.c index c732e3aa7176f219b5ef924701f961ab8303cfc5..19d4318fe99941274000575e10e9d3c7d765925e 100644 --- a/Drivers/Screen/Android/screen.c +++ b/Drivers/Screen/Android/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2012 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/AtSpi/Makefile.in b/Drivers/Screen/AtSpi/Makefile.in index bf8f61af8bb51aa0cab992fb10f30b4025420e00..74fea37d2b13c9d068b3b17e2f89354aa519b5b4 100644 --- a/Drivers/Screen/AtSpi/Makefile.in +++ b/Drivers/Screen/AtSpi/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/AtSpi/screen.c b/Drivers/Screen/AtSpi/screen.c index f43ff3809e83f2efc9a58551f8b6749e5d188253..002745d942bf9ac126160b8f4ab672352be942fc 100644 --- a/Drivers/Screen/AtSpi/screen.c +++ b/Drivers/Screen/AtSpi/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/AtSpi2/Makefile.in b/Drivers/Screen/AtSpi2/Makefile.in index eef560a1532e8b39ad74a4abf35b04b0ac0d77bb..8f4ecfcc6dd051074a32cdbfb67b02640d635a18 100644 --- a/Drivers/Screen/AtSpi2/Makefile.in +++ b/Drivers/Screen/AtSpi2/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/AtSpi2/screen.c b/Drivers/Screen/AtSpi2/screen.c index d572f987fedb8da92d4e3d37402f250020fbcefe..801d156b71e133cf652dd75a68081afe52082e93 100644 --- a/Drivers/Screen/AtSpi2/screen.c +++ b/Drivers/Screen/AtSpi2/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Grub/Makefile.in b/Drivers/Screen/Grub/Makefile.in index ee3f8ddfd4c2c3995c0dc2e9729975d29b8d0b7b..2f5f2820bc7dd5debe3fac151f010e84c20e504b 100644 --- a/Drivers/Screen/Grub/Makefile.in +++ b/Drivers/Screen/Grub/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Grub/screen.c b/Drivers/Screen/Grub/screen.c index 2722c61e94f2c21ced38c2f769afe1aadfa52bb9..7259fdb284c6526c758cd5e97ebf001ee15ea308 100644 --- a/Drivers/Screen/Grub/screen.c +++ b/Drivers/Screen/Grub/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Hurd/Makefile.in b/Drivers/Screen/Hurd/Makefile.in index 16693d75c48e916fdf209c75d741291272fe204a..bf1649c7457a1df5f309be078b8c7680e1c3ffcb 100644 --- a/Drivers/Screen/Hurd/Makefile.in +++ b/Drivers/Screen/Hurd/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Hurd/screen.c b/Drivers/Screen/Hurd/screen.c index cd3b4f100b1e898551badc9aa6ffe53511ef687c..c76fb08ab54ab2ceb682295c219c1f23ba92c566 100644 --- a/Drivers/Screen/Hurd/screen.c +++ b/Drivers/Screen/Hurd/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Hurd/screen.h b/Drivers/Screen/Hurd/screen.h index 3e43038b644352739183cbe858b33b2634752d2d..dfd2c90a4f4c42f94cc1d792e70859ee9de2b8c1 100644 --- a/Drivers/Screen/Hurd/screen.h +++ b/Drivers/Screen/Hurd/screen.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Linux/Makefile.in b/Drivers/Screen/Linux/Makefile.in index f8c57091597e2795f4eefcf85fe3acdc2c6e5e62..04e84057406bfa8fb51f0ef9fbfdf2add4bf998d 100644 --- a/Drivers/Screen/Linux/Makefile.in +++ b/Drivers/Screen/Linux/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Linux/screen.c b/Drivers/Screen/Linux/screen.c index f2d6ebb2c280d48aeff0ac2d4722e444ac9cd238..bc2f2c40acfa5e1b4de510e8816e8a4a5d366520 100644 --- a/Drivers/Screen/Linux/screen.c +++ b/Drivers/Screen/Linux/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -912,7 +912,9 @@ setTranslationTable (int force) { const struct unipair *sfm = &screenFontMapTable[--screenFontMapIndex]; if (sfm->fontpos < count) { - translationTable[sfm->fontpos] = sfm->unicode; + wchar_t *character = &translationTable[sfm->fontpos]; + if (*character == 0X20) continue; + *character = sfm->unicode; } } } diff --git a/Drivers/Screen/Linux/screen.h b/Drivers/Screen/Linux/screen.h index 3e3ebab839b90954be8e11e214bae4e85080ad45..2cb30d6f27f4438c7ea87aa8b0212ffbeac6d209 100644 --- a/Drivers/Screen/Linux/screen.h +++ b/Drivers/Screen/Linux/screen.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/PcBios/Makefile.in b/Drivers/Screen/PcBios/Makefile.in index f61adbd452c39f7a1c13333734c713adfc071c1e..533c1d0e80e407d0f0e9add87b3044396a6e4460 100644 --- a/Drivers/Screen/PcBios/Makefile.in +++ b/Drivers/Screen/PcBios/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/PcBios/screen.c b/Drivers/Screen/PcBios/screen.c index 62c32b3c59a92a2e00bf669a411c58f9dbc0b1b7..2d02754dfdc7343e08d5088d7c9aa7ce367ed2f0 100644 --- a/Drivers/Screen/PcBios/screen.c +++ b/Drivers/Screen/PcBios/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Screen/Makefile.in b/Drivers/Screen/Screen/Makefile.in index cdcf859ad807c3336be45db2b623daef7ae09560..fa7581e9d0e5c453127c25963a6fb6b181da6e29 100644 --- a/Drivers/Screen/Screen/Makefile.in +++ b/Drivers/Screen/Screen/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Screen/screen.c b/Drivers/Screen/Screen/screen.c index b0f8362214bf467e1b98c56895fff52f68ab3cfd..e3983381f74b1bb4e8dc66c103b82d6fc5d951c9 100644 --- a/Drivers/Screen/Screen/screen.c +++ b/Drivers/Screen/Screen/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Screen/screen.h b/Drivers/Screen/Screen/screen.h index 2421c2d0ca1f5c0438bbecff4c514bd29805d386..8d2f3952c1cd6a6aab8c518a1a3fe19ea2099373 100644 --- a/Drivers/Screen/Screen/screen.h +++ b/Drivers/Screen/Screen/screen.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Skeleton/Makefile.in b/Drivers/Screen/Skeleton/Makefile.in index 0d1335e53fd422989223a45adb65c3bb1725cf60..62f80d7ec4cf2b8388373c648358f4a834e2d860 100644 --- a/Drivers/Screen/Skeleton/Makefile.in +++ b/Drivers/Screen/Skeleton/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Skeleton/screen.c b/Drivers/Screen/Skeleton/screen.c index 2722c61e94f2c21ced38c2f769afe1aadfa52bb9..7259fdb284c6526c758cd5e97ebf001ee15ea308 100644 --- a/Drivers/Screen/Skeleton/screen.c +++ b/Drivers/Screen/Skeleton/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Screen/Windows/Makefile.in b/Drivers/Screen/Windows/Makefile.in index efbb735be08e422e5178c0e8df75a24824dad6b6..fa65359f990fc2036076cd9f0d4238d73c542961 100644 --- a/Drivers/Screen/Windows/Makefile.in +++ b/Drivers/Screen/Windows/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Screen/Windows/screen.c b/Drivers/Screen/Windows/screen.c index 703728fe7e00b99716093afb2a4d47911df6e6a9..f89e11c7609e501b94df5864f70d54097a07e205 100644 --- a/Drivers/Screen/Windows/screen.c +++ b/Drivers/Screen/Windows/screen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Alva/Makefile.in b/Drivers/Speech/Alva/Makefile.in index 10db3a1a9c6b96082cb4d0e9f1defa84989eb63d..26a41699d690a1045da61e4275b24ecafd990870 100644 --- a/Drivers/Speech/Alva/Makefile.in +++ b/Drivers/Speech/Alva/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Alva/speech.c b/Drivers/Speech/Alva/speech.c index 5716d77ee9e56ff005833d84b46d4b1b7a6a2abd..654204c569c3da3d2a755660636626b307b0d3a1 100644 --- a/Drivers/Speech/Alva/speech.c +++ b/Drivers/Speech/Alva/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Alva/speech.h b/Drivers/Speech/Alva/speech.h index e1ecb0f15af429e0bb284872a17c0dccf5afcf6e..8faf6d55def54a779de1aa9529a169f34d6fc53e 100644 --- a/Drivers/Speech/Alva/speech.h +++ b/Drivers/Speech/Alva/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Android/Makefile.in b/Drivers/Speech/Android/Makefile.in index 3c4c198f8b3cb2b2a716203874b869badeb6b1ed..5936d45e0de70d21dcd06aee675f5487e81b3758 100644 --- a/Drivers/Speech/Android/Makefile.in +++ b/Drivers/Speech/Android/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Android/speech.c b/Drivers/Speech/Android/speech.c index a2be36a5dfc0235341d67fac6a0b657d1d168047..654f89606c48d704ec9a9ff79c3b67a054ef217b 100644 --- a/Drivers/Speech/Android/speech.c +++ b/Drivers/Speech/Android/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/BrailleLite/Makefile.in b/Drivers/Speech/BrailleLite/Makefile.in index 52c8ab08b6719160213173926c9700270cc53870..44e77a1947b5691675790770c6945eb3d16ea811 100644 --- a/Drivers/Speech/BrailleLite/Makefile.in +++ b/Drivers/Speech/BrailleLite/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/BrailleLite/speech.c b/Drivers/Speech/BrailleLite/speech.c index 8c23c7bf28823805b0231b89bfe26e075f2df8cd..f8ff34bba1644bbc077eec6356533b3a56a3e44a 100644 --- a/Drivers/Speech/BrailleLite/speech.c +++ b/Drivers/Speech/BrailleLite/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/BrailleLite/speech.h b/Drivers/Speech/BrailleLite/speech.h index 35dc8be87a4bc1e9550807ce74fd235cf3b69fd9..27304bec098c17922d27d43b31f634a91ed0b705 100644 --- a/Drivers/Speech/BrailleLite/speech.h +++ b/Drivers/Speech/BrailleLite/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/CombiBraille/Makefile.in b/Drivers/Speech/CombiBraille/Makefile.in index ea3da484e8e53d46b98af3794167239a77b4f145..53857d6371f8486edb0d5734a7aa6f31e39ec619 100644 --- a/Drivers/Speech/CombiBraille/Makefile.in +++ b/Drivers/Speech/CombiBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/CombiBraille/speech.c b/Drivers/Speech/CombiBraille/speech.c index 8ac1c0a8ddcd3da6bd12935cb5dcdcbec36f2b0a..c7bf442c7a35fab30f4144112089bbeae3fe9882 100644 --- a/Drivers/Speech/CombiBraille/speech.c +++ b/Drivers/Speech/CombiBraille/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,12 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* CombiBraille/speech.c - Speech library - * For Tieman B.V.'s CombiBraille (serial interface only) - * Maintained by Nikhil Nair - * $Id: speech.c,v 1.2 1996/09/24 01:04:29 nn201 Exp $ - */ - #include "prologue.h" #include diff --git a/Drivers/Speech/CombiBraille/speech.h b/Drivers/Speech/CombiBraille/speech.h index 5876a07104ea174c223eb7ae094ddaf51254aaca..7781412b7448187f162a2dc82fd3e1f42597df67 100644 --- a/Drivers/Speech/CombiBraille/speech.h +++ b/Drivers/Speech/CombiBraille/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,11 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* CombiBraille/speech.h - definitions for rudimentary speech support - * N. Nair, 3 September 1996 - * $Id: speech.h,v 1.2 1996/09/21 23:34:52 nn201 Exp $ - */ - /* These sequences are sent to the CombiBraille before and after the * speech data itself. The first byte is the length, so embedded nuls are * allowed. diff --git a/Drivers/Speech/ExternalSpeech/Makefile.in b/Drivers/Speech/ExternalSpeech/Makefile.in index 1dea32a56b5fe694b18ca3368eb3db05fd1e649f..7eca90978899a6d741fd4e8b78821cb64e35bb5c 100644 --- a/Drivers/Speech/ExternalSpeech/Makefile.in +++ b/Drivers/Speech/ExternalSpeech/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/ExternalSpeech/speech.c b/Drivers/Speech/ExternalSpeech/speech.c index 56e607939907303f631d954594587281edf169f8..6b67c8a7027e962d07ea5a7f49b4a3765ee9f81e 100644 --- a/Drivers/Speech/ExternalSpeech/speech.c +++ b/Drivers/Speech/ExternalSpeech/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/ExternalSpeech/speech.h b/Drivers/Speech/ExternalSpeech/speech.h index 738b2775821cf37331871343049b875a2bf9d1a1..7ca45e4d47725b0836b1c6e795f6d5603ce4f2bf 100644 --- a/Drivers/Speech/ExternalSpeech/speech.h +++ b/Drivers/Speech/ExternalSpeech/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Festival/Makefile.in b/Drivers/Speech/Festival/Makefile.in index a696fe4537aac0ab179d3397d3367e81ce5f36d2..3940563f35e258e216417625143ff60ff72864d1 100644 --- a/Drivers/Speech/Festival/Makefile.in +++ b/Drivers/Speech/Festival/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Festival/speech.c b/Drivers/Speech/Festival/speech.c index a11a17f8bf257bd178478caa271a6459987103cb..256dc89c3877fe3a3b6b7b5ef4421c1119da7088 100644 --- a/Drivers/Speech/Festival/speech.c +++ b/Drivers/Speech/Festival/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Festival/speech.h b/Drivers/Speech/Festival/speech.h index ae9cd8ea6a5eb19a771d245d978765b1dc0dd202..b33bdb2562c2c291e4ce4974cfb2ce5ac0d7ea46 100644 --- a/Drivers/Speech/Festival/speech.h +++ b/Drivers/Speech/Festival/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/FestivalLite/Makefile.in b/Drivers/Speech/FestivalLite/Makefile.in index ec4b4513c3f34ddd800d70243b259c782b281b4f..c2126a8ea2650ddf7d322aa57404cda7f6de4d3c 100644 --- a/Drivers/Speech/FestivalLite/Makefile.in +++ b/Drivers/Speech/FestivalLite/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/FestivalLite/speech.c b/Drivers/Speech/FestivalLite/speech.c index 2984abef322851513924e0812d2d310012bdd35f..8d23f912f8e82323a22640bd0e25242905f71c98 100644 --- a/Drivers/Speech/FestivalLite/speech.c +++ b/Drivers/Speech/FestivalLite/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/GenericSay/Makefile.in b/Drivers/Speech/GenericSay/Makefile.in index f6e61462d71cd41750ae1c392e679c92c1236797..c52318df8a35f2bc3c160c5e1e16a3f5b720056c 100644 --- a/Drivers/Speech/GenericSay/Makefile.in +++ b/Drivers/Speech/GenericSay/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/GenericSay/commands/AccentSA b/Drivers/Speech/GenericSay/commands/AccentSA index a14b469cf3afdfd9e4e45df3974c18b9d0fb3107..a70c29c09ef730f944c70f3e05d02cfea5f86eaa 100755 --- a/Drivers/Speech/GenericSay/commands/AccentSA +++ b/Drivers/Speech/GenericSay/commands/AccentSA @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/GenericSay/commands/say b/Drivers/Speech/GenericSay/commands/say index 39e5c5d363af9337ba07462e52f18607de9e3298..446c586dd54e2ab21b5f02a1f32265127768e855 100755 --- a/Drivers/Speech/GenericSay/commands/say +++ b/Drivers/Speech/GenericSay/commands/say @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/GenericSay/speech.c b/Drivers/Speech/GenericSay/speech.c index b4f2c382055e446aff8d967962c9920a9fc052ec..baf5629660a8fa98c81a76badb1d3a9c50bfd559 100644 --- a/Drivers/Speech/GenericSay/speech.c +++ b/Drivers/Speech/GenericSay/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/GenericSay/speech.h b/Drivers/Speech/GenericSay/speech.h index c2e34cd25745e2ecdac29b9d74aba24d164327c7..e13d7e4d7f8f05865975425fca4528c53febb3ca 100644 --- a/Drivers/Speech/GenericSay/speech.h +++ b/Drivers/Speech/GenericSay/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Mikropuhe/Makefile.in b/Drivers/Speech/Mikropuhe/Makefile.in index 90dbc923ffab11e204bc4b6f08734c7667c03870..c0681a8f17583ed87f490b9c778bddb461555b1c 100644 --- a/Drivers/Speech/Mikropuhe/Makefile.in +++ b/Drivers/Speech/Mikropuhe/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Mikropuhe/speech.c b/Drivers/Speech/Mikropuhe/speech.c index e7274a7bd10b220b3a5d7fb67ca586d0385a982b..6ca3b235e974ea244bd1a58ccdbff2382a6013b2 100644 --- a/Drivers/Speech/Mikropuhe/speech.c +++ b/Drivers/Speech/Mikropuhe/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/MultiBraille/Makefile.in b/Drivers/Speech/MultiBraille/Makefile.in index 0190043f97dbe79d038ad9241ac4736f39479d02..25217c19d863c4a7e62fa56186bd517818c2b3c4 100644 --- a/Drivers/Speech/MultiBraille/Makefile.in +++ b/Drivers/Speech/MultiBraille/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/MultiBraille/speech.c b/Drivers/Speech/MultiBraille/speech.c index ec8e53e0a4690db8903cfaac9c8d3a372c33a0de..59e63255776c2d55c833f39596c723e044a9968b 100644 --- a/Drivers/Speech/MultiBraille/speech.c +++ b/Drivers/Speech/MultiBraille/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,12 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* CombiBraille/speech.c - Speech library - * For Tieman B.V.'s CombiBraille (serial interface only) - * Maintained by Nikhil Nair - * $Id: speech.c,v 1.2 1996/09/24 01:04:29 nn201 Exp $ - */ - #include "prologue.h" #include diff --git a/Drivers/Speech/MultiBraille/speech.h b/Drivers/Speech/MultiBraille/speech.h index d0074886e8898c63ee8b1c84e10f3dadb35c9b69..eadbc20df3d30d114b480f1a8d0a77ccb16100a5 100644 --- a/Drivers/Speech/MultiBraille/speech.h +++ b/Drivers/Speech/MultiBraille/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,11 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* CombiBraille/speech.h - definitions for rudimentary speech support - * N. Nair, 3 September 1996 - * $Id: speech.h,v 1.2 1996/09/21 23:34:52 nn201 Exp $ - */ - /* These sequences are sent to the CombiBraille before and after the * speech data itself. The first byte is the length, so embedded nuls are * allowed. diff --git a/Drivers/Speech/Skeleton/Makefile.in b/Drivers/Speech/Skeleton/Makefile.in index 5869f2a2a312a69791619f4eea98f87299ad7995..dda1f4d800f7bc46f1d25315fea71659dc059b67 100644 --- a/Drivers/Speech/Skeleton/Makefile.in +++ b/Drivers/Speech/Skeleton/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Skeleton/speech.c b/Drivers/Speech/Skeleton/speech.c index af27155d2e83ec94f9d1fef9fe99483dcd226b09..7b2ef7612676cb26648a7bab3b9bd5f66fb55ce3 100644 --- a/Drivers/Speech/Skeleton/speech.c +++ b/Drivers/Speech/Skeleton/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/SpeechDispatcher/Makefile.in b/Drivers/Speech/SpeechDispatcher/Makefile.in index 1c727abbbb6c6cb643ac182d6498dc790c219b4a..81b66d7a2541ec4ce1e8d09f81eb6d734e2283a4 100644 --- a/Drivers/Speech/SpeechDispatcher/Makefile.in +++ b/Drivers/Speech/SpeechDispatcher/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c index 6be4004e47a33964188717f51e6012811164e179..d9346f282f7e8c12f61a1dddbf247951517e1656 100644 --- a/Drivers/Speech/SpeechDispatcher/speech.c +++ b/Drivers/Speech/SpeechDispatcher/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Swift/Makefile.in b/Drivers/Speech/Swift/Makefile.in index 932d4b35bca55f3047d3c509d89176d3d56b6560..b2778636c10d3b25e9db0fb83a18bcd9bd109c21 100644 --- a/Drivers/Speech/Swift/Makefile.in +++ b/Drivers/Speech/Swift/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Swift/speech.c b/Drivers/Speech/Swift/speech.c index 99651bcef8b0c2c68e9f350e404b0595b73d3866..c7fd9973102cc61e28c724080bc0c42b4d2d2813 100644 --- a/Drivers/Speech/Swift/speech.c +++ b/Drivers/Speech/Swift/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/Theta/Makefile.in b/Drivers/Speech/Theta/Makefile.in index 3e4e024ccb2a18c9cdc803b66f44c9a59e9cfcdb..f2032458aa2ec9629e650cb15301f7fd87147b3b 100644 --- a/Drivers/Speech/Theta/Makefile.in +++ b/Drivers/Speech/Theta/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/Theta/speech.c b/Drivers/Speech/Theta/speech.c index df95b2fba64d18acbff3e1ab536eef40ed11ea2b..2fa430ca2e581d912fb06a6e9e7ec07c78fe7766 100644 --- a/Drivers/Speech/Theta/speech.c +++ b/Drivers/Speech/Theta/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/ViaVoice/Makefile.in b/Drivers/Speech/ViaVoice/Makefile.in index e8213f638342d8d7e8104cb4066c3abe1bea132e..4a1ba4bf5629c5e3c0a1386c5f3e00a2e662e07c 100644 --- a/Drivers/Speech/ViaVoice/Makefile.in +++ b/Drivers/Speech/ViaVoice/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/ViaVoice/speech.c b/Drivers/Speech/ViaVoice/speech.c index 5be1bd63e590c01d8c085de4597626c4cd50bc86..8ecfc974d9ed92007f7c2be5ba0b5a91164371de 100644 --- a/Drivers/Speech/ViaVoice/speech.c +++ b/Drivers/Speech/ViaVoice/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/ViaVoice/speech.h b/Drivers/Speech/ViaVoice/speech.h index ac54eafc0885557cf7ba196d1ce45e0c8dff1453..220982a46ae09c90d30786c897bd520595aa6856 100644 --- a/Drivers/Speech/ViaVoice/speech.h +++ b/Drivers/Speech/ViaVoice/speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Speech/eSpeak/Makefile.in b/Drivers/Speech/eSpeak/Makefile.in index 49c5f6f917873633391be2544c5f1421a3f73c13..026922bb638e07cafbb15e4c3e93c08a02e3d39b 100644 --- a/Drivers/Speech/eSpeak/Makefile.in +++ b/Drivers/Speech/eSpeak/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Drivers/Speech/eSpeak/speech.c b/Drivers/Speech/eSpeak/speech.c index efe872e7edbd0f8b5d3093062a7ee39a724e23d2..fcc8ba465fda508e6635edc49584b5b385f0e91e 100644 --- a/Drivers/Speech/eSpeak/speech.c +++ b/Drivers/Speech/eSpeak/speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/addresses.h b/Headers/addresses.h index a800170378164270daf78c4d8a497a8b6efefe1d..63b7cc36297b46bfdf908b41bba031f470978df9 100644 --- a/Headers/addresses.h +++ b/Headers/addresses.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/alert.h b/Headers/alert.h index f54e61e71469f6b99495fa1ae878cda05fe45871..e57cc5842d9819267dae06b2791581ab251ed5a3 100644 --- a/Headers/alert.h +++ b/Headers/alert.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -52,8 +52,8 @@ typedef enum { ALERT_WRAP_UP, ALERT_SKIP_FIRST, - ALERT_SKIP, - ALERT_SKIP_MORE, + ALERT_SKIP_ONE, + ALERT_SKIP_SEVERAL, ALERT_BOUNCE, ALERT_ROUTING_STARTED, @@ -65,6 +65,7 @@ typedef enum { ALERT_MODIFIER_OFF, ALERT_CONSOLE_BELL, + ALERT_KEYS_AUTORELEASED, } AlertIdentifier; extern void alert (AlertIdentifier identifier); diff --git a/Headers/api_types.h b/Headers/api_types.h index 00ca86fb90876be5b23c38a2a13789537e42f57e..6fb3ad48e69667a6a1cd8e9e7d4ee6ccdeabdf50 100644 --- a/Headers/api_types.h +++ b/Headers/api_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -35,6 +35,7 @@ typedef struct { void (*link) (void); void (*unlink) (void); + int (*isLinked) (void); void (*suspend) (void); int (*resume) (void); diff --git a/Headers/ascii.h b/Headers/ascii.h index 105df2d1c1f2c79b9c9d9a3017629b1f1f73c4c5..37446fcd84e210f2e52662299d05f024a61ed582 100644 --- a/Headers/ascii.h +++ b/Headers/ascii.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async.h b/Headers/async.h index e8488efa17a35e7a25c8ad50b136b81accf15461..67286b0af7911b86c01b2430ec17d1fb2927f84d 100644 --- a/Headers/async.h +++ b/Headers/async.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async_alarm.h b/Headers/async_alarm.h index 346ee6665e3f9c4257e427bca74dbc152db01e7e..f8cbb3a74cae81a8b46366d7af38fce3d28d3e90 100644 --- a/Headers/async_alarm.h +++ b/Headers/async_alarm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async_event.h b/Headers/async_event.h index b0fbcf6800267aa441da24b64b07526c41db52ce..d1169a4a1f942b9e91226faffca3b3b92fb034f8 100644 --- a/Headers/async_event.h +++ b/Headers/async_event.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async_io.h b/Headers/async_io.h index 79c7e7092c47ad561df00c2fc65ff48a5483153b..12fb8863aa7ca617ff4f298d540538c26ef538e6 100644 --- a/Headers/async_io.h +++ b/Headers/async_io.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async_signal.h b/Headers/async_signal.h index 522bcdefcfafd6608151c182e0d7ec3f189b71b4..eda3b0f29b64f0a7794d6c476e4ae4585613063b 100644 --- a/Headers/async_signal.h +++ b/Headers/async_signal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async_task.h b/Headers/async_task.h index a3a542b2be3bb751f171b04ea274bcdbe19ff6d6..44c464b9b1de7a66c3945914dd68c6ce09f5a819 100644 --- a/Headers/async_task.h +++ b/Headers/async_task.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/async_wait.h b/Headers/async_wait.h index fa3b67c43c6e3e42788570e407112b1dd9b1094a..b0b45f09c6733c1719878d2b1c077fb9d294002d 100644 --- a/Headers/async_wait.h +++ b/Headers/async_wait.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/atb.h b/Headers/atb.h index 348c4531c297e4057f19672d5c54a7db568295d5..94f29b8715651ef8ea0e155cd15d13a6cd18b6cc 100644 --- a/Headers/atb.h +++ b/Headers/atb.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/auth.h b/Headers/auth.h index 9e2603b80ca87a59e30cedb30e826951c0220ae7..0b6d1afa88e68119322e3246f56f7a1e9aaf8c65 100644 --- a/Headers/auth.h +++ b/Headers/auth.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/beep.h b/Headers/beep.h index 0faff4876b58a9a7abf1e033e449a5c73e7f7650..ee47d14d0573f5cf19316d36184266b7a490288c 100644 --- a/Headers/beep.h +++ b/Headers/beep.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/bell.h b/Headers/bell.h index 5a43b2d4255ae759a6b5a6446e505dd5e36e92f9..0f369fc960e3657552040546630475585cdc3113 100644 --- a/Headers/bell.h +++ b/Headers/bell.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/bitfield.h b/Headers/bitfield.h index f626c3537b075a62385f1029019e89e996f96dfb..d8a58f3d820d5b512e33147f7456d4bcb00cb946 100644 --- a/Headers/bitfield.h +++ b/Headers/bitfield.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/bitmask.h b/Headers/bitmask.h index 8fe166a8586d7f33b3481bee5cbe070c48cbeb92..52054f6977df1ec363bd71699c62996b94c75a21 100644 --- a/Headers/bitmask.h +++ b/Headers/bitmask.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_base.h b/Headers/brl_base.h index cdff579727bd998bcdb40fb6e1634b1e481216c9..8e2b598977b429d22036835cfbadc71a297746f5 100644 --- a/Headers/brl_base.h +++ b/Headers/brl_base.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_cmds.h b/Headers/brl_cmds.h index ef6c6b59a1abcacdbff27785ea62b91c22aadffb..590ce91264ca5a2c24536670bbcce343997fb92d 100644 --- a/Headers/brl_cmds.h +++ b/Headers/brl_cmds.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_custom.h b/Headers/brl_custom.h index 1acc9bb303e1258c2a61161602d2789480e828c5..a100d29e9292a5b71864cd51756a9c6c94170d7f 100644 --- a/Headers/brl_custom.h +++ b/Headers/brl_custom.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_dots.h b/Headers/brl_dots.h index 74c46cfdac600338fcd104e193694a897e4257dd..11bd267a8191d2eb333c1a1ec658da0c3a637b13 100644 --- a/Headers/brl_dots.h +++ b/Headers/brl_dots.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_driver.h b/Headers/brl_driver.h index d582f203c35ff541aa5c48eff32f1e99c83bd3fb..d66e312ba9c63a1f8cf5d744c4cb85ea4e7a2eca 100644 --- a/Headers/brl_driver.h +++ b/Headers/brl_driver.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_types.h b/Headers/brl_types.h index 2c0d257cbff3ef22bf0fea09c0aaa0eb4f162d91..12c35a197a4514cab2853a0513ddddc563b516c5 100644 --- a/Headers/brl_types.h +++ b/Headers/brl_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/brl_utils.h b/Headers/brl_utils.h index 88d1a83a11b348ba03f54afee1f8e77719e46b39..7f1fdb4d93b1edc66afbb5e71d757bd54ec0bb6f 100644 --- a/Headers/brl_utils.h +++ b/Headers/brl_utils.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/charset.h b/Headers/charset.h index 6294cf542634078fc713d68cdad5364c9ef6f679..00c2f7ed5f460a6c265d35934464157b1bf89f05 100644 --- a/Headers/charset.h +++ b/Headers/charset.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/cmd.h b/Headers/cmd.h index c2ec82413e3a2beacb2ce1da3e33941e749427d9..417cc28c0cef66bfd90bf5a6610dc012c9a27175 100644 --- a/Headers/cmd.h +++ b/Headers/cmd.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/cmd_enqueue.h b/Headers/cmd_enqueue.h index 76ccb5fe8c8da315d1721fd527b7ba765e87b6de..eb85e4ff832c5315c4ae75a75f206820af6282eb 100644 --- a/Headers/cmd_enqueue.h +++ b/Headers/cmd_enqueue.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/cmd_types.h b/Headers/cmd_types.h index ff8e18d7b2233e2efaad88d543d70538cd70b1d3..61c63d67e094087fd046f1fb893c80c8c71d5868 100644 --- a/Headers/cmd_types.h +++ b/Headers/cmd_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/ctb.h b/Headers/ctb.h index d3cd5369f77da950528ede569c61cac72a9145cb..b2178115a51ffc21c1d6a706fcb53b21be87fe26 100644 --- a/Headers/ctb.h +++ b/Headers/ctb.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/ctb_types.h b/Headers/ctb_types.h index 94420c6885ca33c377dfaa7cae6c0aed293586c6..aace367fa1c7958ff4a457c6dacad4a3671fc86e 100644 --- a/Headers/ctb_types.h +++ b/Headers/ctb_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/dataarea.h b/Headers/dataarea.h index 6e578bd95a0a5cef813a0b89b810ee962bf3eb2a..6fcc360740cbb620a4ab30206e54387d3f40268e 100644 --- a/Headers/dataarea.h +++ b/Headers/dataarea.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/datafile.h b/Headers/datafile.h index e445674211d2786a02dec8f7292c32809f051f3c..722e971f3f8af7a2dad750309969ebb50c5f5cf8 100644 --- a/Headers/datafile.h +++ b/Headers/datafile.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -21,19 +21,14 @@ #include +#include "variables.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -typedef struct { - const char *name; - const char *value; -} DataVariableInitializer; - -extern int setGlobalDataVariable (const char *name, const char *value); -extern int setBaseDataVariables (const DataVariableInitializer *initializers); +extern int setBaseDataVariables (const VariableInitializer *initializers); extern int setTableDataVariables (const char *tableExtension, const char *subtableExtension); -extern void listDataVariables (void); extern FILE *openDataFile (const char *path, const char *mode, int optional); @@ -42,13 +37,23 @@ typedef struct DataFileStruct DataFile; #define DATA_OPERANDS_PROCESSOR(name) int name (DataFile *file, void *data) typedef DATA_OPERANDS_PROCESSOR(DataOperandsProcessor); -extern int processDataFile (const char *name, DataOperandsProcessor *processLine, void *data); +typedef enum { + DFO_NO_COMMENTS = 0X01 +} DataFileOptions; + +typedef struct { + DataOperandsProcessor *processOperands; + void *data; + unsigned char options; +} DataFileParameters; + +extern int processDataFile (const char *name, const DataFileParameters *parameters); extern void reportDataError (DataFile *file, char *format, ...) PRINTF(2, 3); extern int processDataStream ( DataFile *includer, FILE *stream, const char *name, - DataOperandsProcessor *processLine, void *data + const DataFileParameters *parameters ); extern int compareKeyword (const wchar_t *keyword, const wchar_t *characters, size_t count); @@ -69,7 +74,8 @@ typedef struct { } DataOperand; extern int getDataOperand (DataFile *file, DataOperand *operand, const char *description); -extern int getDataText (DataFile *file, DataOperand *text, const char *description); +extern int getTextOperand (DataFile *file, DataOperand *text, const char *description); +extern void getTextRemaining (DataFile *file, DataOperand *text); typedef struct { unsigned char length; diff --git a/Headers/device.h b/Headers/device.h index 964f0844e35077bf441f4894e212dc34243eadfc..a6b685fc6691838b635d3ab5857d4e31df0e5b8b 100644 --- a/Headers/device.h +++ b/Headers/device.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/driver.h b/Headers/driver.h index b9a1e74a91f0e81ce49110e9519b9c5db049d2cc..1c1948848092c11690dc8f3463b3a1d7ded72103 100644 --- a/Headers/driver.h +++ b/Headers/driver.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/drivers.h b/Headers/drivers.h index cbe37c79f8856aee0857ea8b486d01e46d398082..57e178b2172548611c268f5bd39bb41413fb861b 100644 --- a/Headers/drivers.h +++ b/Headers/drivers.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/dynld.h b/Headers/dynld.h index 67c97ff90a064ab81b0050095cff84c7c2d14184..fc2aa2a1fd3e2013c40b6484a0b4088b424ab525 100644 --- a/Headers/dynld.h +++ b/Headers/dynld.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/embed.h b/Headers/embed.h index 69fee63a109f8657ad076e6139fd2584965450e7..49cbbf51d7e2f304a31542dbf24b1eda3fac1b7d 100644 --- a/Headers/embed.h +++ b/Headers/embed.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/file.h b/Headers/file.h index 115092928dc879067b75f7ad24da99ca09ab31ea..82484daf1efd3722925b690c18cd551fb72574b9 100644 --- a/Headers/file.h +++ b/Headers/file.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/fm.h b/Headers/fm.h index 425915f554ffe2be447490f1e3bc5d4064b45d55..6f80a88ebcab599a727da46348f409eccfb3a13b 100644 --- a/Headers/fm.h +++ b/Headers/fm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/fm_adlib.h b/Headers/fm_adlib.h index 941a5c55380aab4dbceaf0790c5264a01ec034ec..7d90f1f9348a001a45a295a2af95204c40cc9765 100644 --- a/Headers/fm_adlib.h +++ b/Headers/fm_adlib.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/get_curses.h b/Headers/get_curses.h index cff61f74d8a10136be49ae8278187db1132a3efe..2520c937b41403351942b765c96fd5f04c4f68a3 100644 --- a/Headers/get_curses.h +++ b/Headers/get_curses.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/get_pthreads.h b/Headers/get_pthreads.h index 166b24180597f4a53c8f7894127b1404d1f21bb5..4472be2ef8feed38ff40c508996f2a36a3502fc5 100644 --- a/Headers/get_pthreads.h +++ b/Headers/get_pthreads.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/get_select.h b/Headers/get_select.h index fd3a1686091d15152cb3d8391ff95f0ce9be5c13..7c9a04d35b6dc3a0fcbd1d823c3002ff536f020c 100644 --- a/Headers/get_select.h +++ b/Headers/get_select.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/get_sockets.h b/Headers/get_sockets.h index f5dbe94d6f2c39fb15fa7c2d28e8025bdf024d7f..44793c96eead244de56fe1f3b4b35dfe575cf389 100644 --- a/Headers/get_sockets.h +++ b/Headers/get_sockets.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/gio_types.h b/Headers/gio_types.h index 90ecee472265029fe840c8b1f3f851d46f67b462..a43720571ffae95dfc2f1b30d0993d7e34c9916f 100644 --- a/Headers/gio_types.h +++ b/Headers/gio_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/hostcmd.h b/Headers/hostcmd.h index 68d6d00043fddfa0f0e70c2b29ba2cf558678a5f..65568399b7a0df4f0907b89d046140c38785176c 100644 --- a/Headers/hostcmd.h +++ b/Headers/hostcmd.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/io_bluetooth.h b/Headers/io_bluetooth.h index d476fa5b92da9151b92eda21e4674d3132581592..3074f3db8c7ab877823c74dc725bb72edffb43ff 100644 --- a/Headers/io_bluetooth.h +++ b/Headers/io_bluetooth.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/io_generic.h b/Headers/io_generic.h index 966ecdbdbcc65c8ea48c4c091b43bafbebf648c5..7a2c17144f0c9658917047bfbf1746085aabca0f 100644 --- a/Headers/io_generic.h +++ b/Headers/io_generic.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/io_misc.h b/Headers/io_misc.h index 84f021910cd2d89d08365346dd1625f34d2e9152..9b762631420e7d16286ab5c2d6bcf427bc58e964 100644 --- a/Headers/io_misc.h +++ b/Headers/io_misc.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/io_serial.h b/Headers/io_serial.h index 65e04ef625d1cf6405648b121fd9c36642de41cd..eb8e59c2c56719758fd5330bacaac357a4b8f8c8 100644 --- a/Headers/io_serial.h +++ b/Headers/io_serial.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/io_usb.h b/Headers/io_usb.h index d09aa70334cee8b8e05d9c0c82f6ef51cce9040e..30244bbf48ad0fee7cefbde8750534a4d3720ded 100644 --- a/Headers/io_usb.h +++ b/Headers/io_usb.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/kbd_keycodes.h b/Headers/kbd_keycodes.h index e6c59670af6a2d86490b1df2c81db04d128de0e2..c5d19753fd7cbad88e252aeaad4388492d71103a 100644 --- a/Headers/kbd_keycodes.h +++ b/Headers/kbd_keycodes.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/ktb.h b/Headers/ktb.h index a86f6cbdaa654e9c90cac9cac83ae779a2a6bf19..456147f99faa34530b8e62079b989399371bbf88 100644 --- a/Headers/ktb.h +++ b/Headers/ktb.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -63,6 +63,7 @@ extern KeyTableState processKeyEvent ( extern void setKeyTableLogLabel (KeyTable *table, const char *label); extern void setLogKeyEventsFlag (KeyTable *table, const unsigned char *flag); extern void setKeyboardEnabledFlag (KeyTable *table, const unsigned char *flag); +extern void setKeyAutoreleaseTime (KeyTable *table, unsigned char seconds); extern void getKeyGroupCommands (KeyTable *table, KeyGroup group, int *commands, unsigned int size); diff --git a/Headers/ktb_types.h b/Headers/ktb_types.h index 3a8838295663973cb4a609e9d323226c7f3b2ae5..929478daa1c0f4d3d294663091c7da66d0e7b4c5 100644 --- a/Headers/ktb_types.h +++ b/Headers/ktb_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/leds.h b/Headers/leds.h index 14182bbc567a9a0aca07f1246cf42cf7065ddd17..253a3dbf20a77456568cac9a756448759a6985ec 100644 --- a/Headers/leds.h +++ b/Headers/leds.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/lock.h b/Headers/lock.h index d0ea349df8973882c4d478b3a7c8c3da6ad281c0..34ddcf6b61ed2083ff8fe7ccf4b10efe7b7bc5b6 100644 --- a/Headers/lock.h +++ b/Headers/lock.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/log.h b/Headers/log.h index 3e09db7d471dfc65544963ce15b24299a79dcc09..2f3f85d0f906313de65c523c5113005c85ab9cfc 100644 --- a/Headers/log.h +++ b/Headers/log.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/menu.h b/Headers/menu.h index 3d62005970e039c2c18d0ccc62b1637fade7b935..af2770b3926876bd59cf617555d5a72bd40cf4ef 100644 --- a/Headers/menu.h +++ b/Headers/menu.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/message.h b/Headers/message.h index 9c3cd4d29166db6fce891b5bb378c532c87860dc..df28023f54908e179424a429ff44e10ea2ade185 100644 --- a/Headers/message.h +++ b/Headers/message.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/midi.h b/Headers/midi.h index 84e17bc8881d539c23ef8eb1859b8a6b8bd4a37c..911a70e7d850042ea86478d53b8cc5bdaeee5d25 100644 --- a/Headers/midi.h +++ b/Headers/midi.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/mntfs.h b/Headers/mntfs.h index 8c255da667c6a2f4bc9d2cd373ea4c067a7a06a8..77a381f3cc129cf7234f253443b449beadbdf726 100644 --- a/Headers/mntfs.h +++ b/Headers/mntfs.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/mntpt.h b/Headers/mntpt.h index 84ba2c1102f4110624a5dd21960bd92be2e9c404..c21f8f4012b366a0e34c8f8b6c66276ca3c46713 100644 --- a/Headers/mntpt.h +++ b/Headers/mntpt.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/note_types.h b/Headers/note_types.h index 5060946bb4dd635d039df27553ea1929daf8b27a..32e497fb369ea849f4b61954a383608b43e618e5 100644 --- a/Headers/note_types.h +++ b/Headers/note_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/notes.h b/Headers/notes.h index 12149e036ba1f6f554ec4b9d3b3e04754568590f..9b44c40836fd1581b8b163bda0347c9fcfa27327 100644 --- a/Headers/notes.h +++ b/Headers/notes.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/options.h b/Headers/options.h index 7fd73ab16369099cc8b09a399390f7c7076afd66..9e4265861516fde3a301c115586df74e225c8e00 100644 --- a/Headers/options.h +++ b/Headers/options.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -21,7 +21,7 @@ #include "strfmth.h" #include "program.h" -#include "file.h" +#include "datafile.h" #ifdef __cplusplus extern "C" { @@ -104,8 +104,7 @@ extern void resetOptions (const OptionsDescriptor *descriptor); typedef struct { void (*beginStream) (const char *name, void *data); void (*endStream) (int incomplete, void *data); - LineHandler *handleLine; - void *data; + DataFileParameters dataFileParameters; } InputFilesProcessingParameters; extern ProgramExitStatus processInputFiles ( diff --git a/Headers/params.h b/Headers/params.h index 41d0e41f2e3dcdc64650a2a98d5e1ed8d83daa3f..c2b3d92a3ce402e2aa29035a802ed83f64d89614 100644 --- a/Headers/params.h +++ b/Headers/params.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/parse.h b/Headers/parse.h index 61615fa4bcf5dccc15625b78c99e16aedb96238a..69e944683af5909b4c6a69f88e9aaa107c42ce14 100644 --- a/Headers/parse.h +++ b/Headers/parse.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/pcm.h b/Headers/pcm.h index 4102f04c0c3712735959c9ff4597b91b2df65731..8d0c539635b1d4ca64861b93b08b3c219a494bf7 100644 --- a/Headers/pcm.h +++ b/Headers/pcm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/pgmpath.h b/Headers/pgmpath.h index 5f989ce090e3d85d34a70887bed26759e05a4d58..71dd842e676d6c5ca85861b35939c61f7530796e 100644 --- a/Headers/pgmpath.h +++ b/Headers/pgmpath.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/pid.h b/Headers/pid.h index 968e3847fe6a695df16dd6605d2b30668bedb06e..40a275902ce6739ab09c0b733abc00c328de6542 100644 --- a/Headers/pid.h +++ b/Headers/pid.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/ports.h b/Headers/ports.h index 864d66a4efe7932e48bd146f1a77461c8a0081e5..0c7b809abe42f89c4d08f5897d3ae41e79df5ddd 100644 --- a/Headers/ports.h +++ b/Headers/ports.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/prefs.h b/Headers/prefs.h index 88547a3969597e6faed755540aec0e6cbed6135e..e773311a211f9829efddb864e18726b83374f74b 100644 --- a/Headers/prefs.h +++ b/Headers/prefs.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -100,6 +100,22 @@ typedef enum { ssTextSide } StatusSeparator; +typedef enum { + atOff, + at5s, + at10s, + at20s, + at40s +} AutoreleaseTime; + +typedef enum { + ctdNone, + ctd250ms, + ctd500ms, + ctd1s, + ctd2s +} CursorTrackingDelay; + /* * Structure definition for preferences (settings which are saveable). */ @@ -110,7 +126,7 @@ typedef struct { unsigned char showAttributes; unsigned char touchSensitivity; unsigned char blinkingScreenCursor; - unsigned char autorepeat; + unsigned char autorepeatEnabled; unsigned char blinkingCapitals; unsigned char longPressTime; unsigned char blinkingAttributes; @@ -191,7 +207,9 @@ typedef struct { unsigned char consoleBellAlert; unsigned char keyboardLedAlerts; + unsigned char autoreleaseTime; unsigned char touchNavigation; + unsigned char cursorTrackingDelay; unsigned char saveOnExit; unsigned char showSubmenuSizes; diff --git a/Headers/program.h b/Headers/program.h index 806f4e0fc73488731f3cf597ebde382140e6f927..86efa145a57154bcaafc173990e8e83acdc0c733 100644 --- a/Headers/program.h +++ b/Headers/program.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/prologue.h b/Headers/prologue.h index d16075270f74603044d8d66673c57e4899de45d7..4924c27b9e5ae32e6b6956d17aaa21cffa3955ce 100644 --- a/Headers/prologue.h +++ b/Headers/prologue.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -23,7 +23,7 @@ extern "C" { #endif /* __cplusplus */ -#define PACKAGE_COPYRIGHT "Copyright (C) 1995-2015 by The BRLTTY Developers." +#define PACKAGE_COPYRIGHT "Copyright (C) 1995-2016 by The BRLTTY Developers." #undef HAVE_BUILTIN_POPCOUNT @@ -45,6 +45,9 @@ extern "C" { #define ARRAY_COUNT(array) (sizeof((array)) / sizeof((array)[0])) #define ARRAY_SIZE(pointer, count) ((count) * sizeof(*(pointer))) +#define IS_WITHIN_RANGE(index,start,end) (((index) >= (start)) && ((index) < (end))) +#define IS_WITHIN_BOUNDS(index,count) IS_WITHIN_RANGE((index), 0, (count)) + #define SYMBOL_TYPE(name) name ## _t #define SYMBOL_POINTER(name) static SYMBOL_TYPE(name) *name##_p = NULL; @@ -276,7 +279,7 @@ WIN_ERRNO_STORAGE_CLASS int win_toErrno (DWORD error); #define wcslen(source) strlen((const char *)(source)) #define wcsnlen(source,count) strnlen((const char *)(source), (count)) -#define wcschr(source,character) strchr((const char *)(source), (char)(character)) +#define wcschr(source,character) ((wchar_t *)strchr((const char *)(source), (char)(character))) #define wcscoll(source1,source2) strcoll((const char *)(source1), (const char *)(source2)) #define wcscspn(source,reject) strcspn((const char *)(source), (const char *)(reject)) #define wcsdup(source) strdup((const char *)(source)) @@ -284,9 +287,10 @@ WIN_ERRNO_STORAGE_CLASS int win_toErrno (DWORD error); #define wcsrchr(source,character) strrchr((const char *)(source), (char)(character)) #define wcsspn(source,accept) strspn((const char *)(source), (const char *)(accept)) #define wcsstr(source,substring) strstr((const char *)(source), (const char *)(substring)) -#define wcstok(target,delimiters,end) strtok_r((char *)(target), (const char *)(delimiters), (char **)(end)) +#define wcstok(target,delimiters,end) ((wchar_t *)strtok(((char *)(target)), ((const char *)(delimiters)))) #define wcswcs(source,substring) strstr((const char *)(source), (const char *)(substring)) #define wcsxfrm(target,source,count) strxfrm((char *)(target), (const char *)(source), (count)) +#define wcstoul(nptr, endptr, base) strtoul(((const char *)(nptr)), ((char **)(endptr)), (base)) #define wcstol(source,end,base) strtol((const char *)(source), (char **)(end), (base)) #define wcstoll(source,end,base) strtoll((const char *)(source), (char **)(end), (base)) @@ -332,8 +336,8 @@ mbsinit (const mbstate_t *ps) { return 1; } -#define WC_C(wc) (wchar_t)wc -#define WS_C(ws) (const wchar_t *)ws +#define WC_C(wc) ((wchar_t)wc) +#define WS_C(ws) ((const wchar_t *)ws) #define PRIwc "c" #define PRIws "s" #define iswLatin1(wc) (1) diff --git a/Headers/queue.h b/Headers/queue.h index 33d1442e2d16f0d784e058b28be950fffc75f294..06ff478ae6acf6b5c88fca15d9f9a1d87d809a3b 100644 --- a/Headers/queue.h +++ b/Headers/queue.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/report.h b/Headers/report.h index 796623e6859cae682845c5cf349466d5812c0ca4..ebbec32ad15d3b3a2419de20789c700f2b2f004a 100644 --- a/Headers/report.h +++ b/Headers/report.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/revision.h b/Headers/revision.h index afc53a5ad929999340295d7fe80fa23166735540..6b5bb66539987ab8232c3db234ece20495e52272 100644 --- a/Headers/revision.h +++ b/Headers/revision.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_base.h b/Headers/scr_base.h index 713d8e4266dca2251a7d489c42a025fd07e766b8..b7ffddba6ba7ef17b25cd642efc0b246104762be 100644 --- a/Headers/scr_base.h +++ b/Headers/scr_base.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_driver.h b/Headers/scr_driver.h index 516860394d701ce94c6a5383a7c0800156c48a37..c9741f1f2efbf659d535a32854674b60c54edd8d 100644 --- a/Headers/scr_driver.h +++ b/Headers/scr_driver.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_gpm.h b/Headers/scr_gpm.h index ca0c3e3f2d6c191d426d59004bbb4a007139b52f..072ee2551fe0d6bfb9145d8b40a9c82ca3ca7e61 100644 --- a/Headers/scr_gpm.h +++ b/Headers/scr_gpm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_main.h b/Headers/scr_main.h index 6bbbaa2bc9e93948473eeacb2dec00c6a63a05a5..8a5619737cad729c8a757e1b88fd60ea20b6fcc8 100644 --- a/Headers/scr_main.h +++ b/Headers/scr_main.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_real.h b/Headers/scr_real.h index 5b212f659c6b0c22f6cb29d85e106c7795d6a222..adced7a4a7f94b8166490b621f3e4c9e786125f7 100644 --- a/Headers/scr_real.h +++ b/Headers/scr_real.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_types.h b/Headers/scr_types.h index 1ff78d30f153df5fb26da4b4093aa821587e4432..11c842860d25b293e3dec04a47e9a3e1cfce2e83 100644 --- a/Headers/scr_types.h +++ b/Headers/scr_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/scr_utils.h b/Headers/scr_utils.h index b9011ee9c1c1d3a4200fa373266ed939d7d20c6a..6306c429387f073ac8b7760610a6a70f6674eaec 100644 --- a/Headers/scr_utils.h +++ b/Headers/scr_utils.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/serial_types.h b/Headers/serial_types.h index b574afcf2174a65f057a911bb346e9f0ca80ff7b..5b727ab59ed201ad2a45f13924c3f8c77c7ac16c 100644 --- a/Headers/serial_types.h +++ b/Headers/serial_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/service.h b/Headers/service.h index cf6a82526cfc29612baafa7c4864f85336594908..d875c28bc83aaf32fb07952095b1b07887658c01 100644 --- a/Headers/service.h +++ b/Headers/service.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/spk.h b/Headers/spk.h index 9d38c2dae40b3a4ca21202a96f07ad1618451ef0..5dc6dab0133d53efb97b13d612ba3c0545503612 100644 --- a/Headers/spk.h +++ b/Headers/spk.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/spk_base.h b/Headers/spk_base.h index 836d7e0925f5db6550ce3e3959acf0c51213b36e..efd2777eb63a611ccfc84d43bfe9840c5827c598 100644 --- a/Headers/spk_base.h +++ b/Headers/spk_base.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/spk_driver.h b/Headers/spk_driver.h index f6d25d2dcac320dd7bed6d02724cac25ccb40f0c..b69954d8ad70effe28238d8bbb8a132e3be5d2f6 100644 --- a/Headers/spk_driver.h +++ b/Headers/spk_driver.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/spk_types.h b/Headers/spk_types.h index 8984c0ce3b9216d26f3af51f59117d7f5b7a5e55..6106c9e659b62d1249563adae429e69f983c5f57 100644 --- a/Headers/spk_types.h +++ b/Headers/spk_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/status_types.h b/Headers/status_types.h index 08350e0f6f4067d4e491611e01ef59cfcb22dac6..e2a5d1f0934538d7cb872dbcf8d3c23ebe6b074b 100644 --- a/Headers/status_types.h +++ b/Headers/status_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/strfmt.h b/Headers/strfmt.h index c0dca965def58d2bfeb78270102a5938b120b2ef..94f5261e70a8c990702880024dcee4e01fceff99 100644 --- a/Headers/strfmt.h +++ b/Headers/strfmt.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -19,6 +19,8 @@ #ifndef BRLTTY_INCLUDED_STRFMT #define BRLTTY_INCLUDED_STRFMT +#include + #include "strfmth.h" #ifdef __cplusplus diff --git a/Headers/strfmth.h b/Headers/strfmth.h index 00c1fdd5adfd0f25e7ceca3dfcd7eebffe68159f..2c260c5720993244724eed5e097c39f359e46b3e 100644 --- a/Headers/strfmth.h +++ b/Headers/strfmth.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/system.h b/Headers/system.h index aa6c2f0352f8ae2d6dfcd45d5042d65eedf8b7a8..21ec74b3c1aedbe644896cfbe67c9a0612fb226a 100644 --- a/Headers/system.h +++ b/Headers/system.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/system_darwin.h b/Headers/system_darwin.h index e20051095c899621fbd39b23d065818fd9a1997e..bace099fdd13a3b2a82c2da808edea5bec9ec054 100644 --- a/Headers/system_darwin.h +++ b/Headers/system_darwin.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/system_java.h b/Headers/system_java.h index c5498290f07d055d9755eeee0a9894054b8e92b1..e85a8ed2b08e6f2196c046af1cb9c7f0ba33d928 100644 --- a/Headers/system_java.h +++ b/Headers/system_java.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/system_linux.h b/Headers/system_linux.h index 58d8263121aba7ea50315ca737033b6de4f6ef6f..8898b4fe29c0fb903b1b6db813a6b73d8bad04c1 100644 --- a/Headers/system_linux.h +++ b/Headers/system_linux.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/system_msdos.h b/Headers/system_msdos.h index 1ab3ae63b6d440134d5a733888763df73ae830ab..1e21eda6141531216676cc924e6607c98c68440f 100644 --- a/Headers/system_msdos.h +++ b/Headers/system_msdos.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/system_windows.h b/Headers/system_windows.h index 65f5b9de4ee864531a50694be068ef0f8434b9dc..ad12bd6dc5889b570bb2327c075f2aa766f1e18e 100644 --- a/Headers/system_windows.h +++ b/Headers/system_windows.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/thread.h b/Headers/thread.h index 720aefffe0aca0af2c4425026eb8ef810a32604c..bc8bc47d1c93420e32714fff9ff112611c39d771 100644 --- a/Headers/thread.h +++ b/Headers/thread.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/timing.h b/Headers/timing.h index 8439aae7f5d37c297faab679bc385c3a19d1e4a2..eb83db80ee448b71c71e6020601fa2505d15e868 100644 --- a/Headers/timing.h +++ b/Headers/timing.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -60,6 +60,8 @@ typedef struct { #define PRInsec PRIi32 extern void getCurrentTime (TimeValue *time); +extern void setCurrentTime (const TimeValue *time); + extern void makeTimeValue (TimeValue *value, const TimeComponents *components); extern void expandTimeValue (const TimeValue *value, TimeComponents *components); extern size_t formatSeconds (char *buffer, size_t size, const char *format, int32_t seconds); diff --git a/Headers/ttb.h b/Headers/ttb.h index 749e4feee9a2807031bb67449f8c52fc2556b99c..775a4d1711ddf4312ef7f69e0a63d054f910b25b 100644 --- a/Headers/ttb.h +++ b/Headers/ttb.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -32,12 +32,14 @@ extern void destroyTextTable (TextTable *table); extern char *ensureTextTableExtension (const char *path); extern char *makeTextTablePath (const char *directory, const char *name); + extern char *selectTextTable (const char *directory); +extern int replaceTextTable (const char *directory, const char *name); extern unsigned char convertCharacterToDots (TextTable *table, wchar_t character); extern wchar_t convertDotsToCharacter (TextTable *table, unsigned char dots); -extern int replaceTextTable (const char *directory, const char *name); +extern void setTryBaseCharacter (TextTable *table, unsigned char yes); #ifdef __cplusplus } diff --git a/Headers/tune.h b/Headers/tune.h index 9583cc73e066e567b9940948215fa26c72d565e6..69cb50e890e2ef38f04de01165a97193426e6c2b 100644 --- a/Headers/tune.h +++ b/Headers/tune.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/tune_build.h b/Headers/tune_build.h index 07eb06f8c3aef09db72d9376854f887c880ef32a..f3afc8c8b04ac8ca85da5df04a9330bed872c82e 100644 --- a/Headers/tune_build.h +++ b/Headers/tune_build.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -28,48 +28,25 @@ extern "C" { #define NOTES_PER_SCALE 7 typedef enum { - TUNE_BUILD_OK, - TUNE_BUILD_SYNTAX, - TUNE_BUILD_FATAL -} TuneBuildStatus; + TUNE_STATUS_OK, + TUNE_STATUS_SYNTAX, + TUNE_STATUS_FATAL +} TuneStatus; -typedef unsigned int TuneNumber; +typedef struct TuneBuilderStruct TuneBuilder; -typedef struct { - const char *name; - TuneNumber minimum; - TuneNumber maximum; - TuneNumber current; -} TuneParameter; - -typedef struct { - TuneBuildStatus status; - - struct { - ToneElement *array; - unsigned int size; - unsigned int count; - } tones; - - signed char accidentals[NOTES_PER_SCALE]; - TuneParameter duration; - TuneParameter note; - TuneParameter octave; - TuneParameter percentage; - TuneParameter tempo; - - struct { - const char *text; - const char *name; - unsigned int index; - } source; -} TuneBuilder; - -extern void initializeTuneBuilder (TuneBuilder *tune); +extern TuneBuilder *newTuneBuilder (void); extern void resetTuneBuilder (TuneBuilder *tune); +extern void destroyTuneBuilder (TuneBuilder *tb); + +extern TuneStatus getTuneStatus (TuneBuilder *tb); +extern void setTuneSourceName (TuneBuilder *tb, const char *name); +extern void setTuneSourceIndex (TuneBuilder *tb, unsigned int index); +extern void incrementTuneSourceIndex (TuneBuilder *tb); -extern int parseTuneLine (TuneBuilder *tune, const char *line); -extern int endTune (TuneBuilder *tune); +extern int parseTuneString (TuneBuilder *tune, const char *string); +extern int parseTuneText (TuneBuilder *tune, const wchar_t *text); +extern ToneElement *getTune (TuneBuilder *tune); extern int addTone (TuneBuilder *tune, const ToneElement *tone); extern int addNote (TuneBuilder *tune, unsigned char note, int duration); diff --git a/Headers/tune_types.h b/Headers/tune_types.h index c50e11495c528c04a42322d020bb8265ae8c3b2b..92da0f2bc0541837b4ac8b18edf3145bd6b90354 100644 --- a/Headers/tune_types.h +++ b/Headers/tune_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/tune_utils.h b/Headers/tune_utils.h index a5a5fd6f1668a264ae7a5ca2df42ff2d2cdc630a..5e1196e6c3837b05c9f8de6d9c3b339217ebf2c0 100644 --- a/Headers/tune_utils.h +++ b/Headers/tune_utils.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/unicode.h b/Headers/unicode.h index 468fc1e0530385d3e76c3a738face1ba0332bf03..8713f4a8d2f965e261bd5175a6ffc39242da4a60 100644 --- a/Headers/unicode.h +++ b/Headers/unicode.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/usb_types.h b/Headers/usb_types.h index 1db56747b65cb8f637b475515cb0f92c07498a84..eed4dc969fac6db4a5be9c1878f79d3b33fb8de7 100644 --- a/Headers/usb_types.h +++ b/Headers/usb_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -350,6 +350,7 @@ typedef struct { int (*setRtsState) (UsbDevice *device, int state); int (*enableAdapter) (UsbDevice *device); + void (*disableAdapter) (UsbDevice *device); UsbInputFilter *inputFilter; ssize_t (*writeData) (UsbDevice *device, const void *data, size_t size); diff --git a/Headers/variables.h b/Headers/variables.h new file mode 100644 index 0000000000000000000000000000000000000000..d98a07260787a79aef9f6c86263cfe03121d84ae --- /dev/null +++ b/Headers/variables.h @@ -0,0 +1,60 @@ +/* + * BRLTTY - A background process providing access to 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 . + */ + +#ifndef BRLTTY_INCLUDED_VARIABLES +#define BRLTTY_INCLUDED_VARIABLES + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef struct VariableNestingLevelStruct VariableNestingLevel; +typedef struct VariableStruct Variable; + +typedef struct { + const char *name; + const char *value; +} VariableInitializer; + +extern VariableNestingLevel *newVariableNestingLevel (VariableNestingLevel *previous, const char *name); +extern VariableNestingLevel *removeVariableNestingLevel (VariableNestingLevel *vnl); + +extern VariableNestingLevel *claimVariableNestingLevel (VariableNestingLevel *vnl); +extern void releaseVariableNestingLevel (VariableNestingLevel *vnl); + +extern void listVariables (VariableNestingLevel *from); +extern const Variable *findReadableVariable (VariableNestingLevel *vnl, const wchar_t *name, int length); +extern Variable *findWritableVariable (VariableNestingLevel *vnl, const wchar_t *name, int length); + +extern void deleteVariables (VariableNestingLevel *vnl); +extern int setVariable (Variable *variable, const wchar_t *value, int length); + +extern void getVariableName (const Variable *variable, const wchar_t **characters, int *length); +extern void getVariableValue (const Variable *variable, const wchar_t **characters, int *length); + +extern int setStringVariable (VariableNestingLevel *vnl, const char *name, const char *value); +extern int setStringVariables (VariableNestingLevel *vnl, const VariableInitializer *initializers); + +extern VariableNestingLevel *getGlobalVariables (int create); +extern int setGlobalVariable (const char *name, const char *value); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* BRLTTY_INCLUDED_VARIABLES */ diff --git a/Headers/win_errno.h b/Headers/win_errno.h index 33590d72dd9806fa4721c10f000fad31f1b899d5..44e528347bd047f8a9489a6592aa6da94240cd51 100644 --- a/Headers/win_errno.h +++ b/Headers/win_errno.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/win_pthread.h b/Headers/win_pthread.h index 92e136fbd38142a021e9ff519688be7f7e4eb2dc..663f5f175bf4e9e4b4372601052622188bf41192 100644 --- a/Headers/win_pthread.h +++ b/Headers/win_pthread.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Makefile.in b/Makefile.in index 64787b0a8a2252b5b874ee73c6539c39dc5267c5..b68df7f142aabf9789617987d81bba7c4b6b88be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -22,6 +22,9 @@ all install uninstall install-documents: install-messages uninstall-messages: cd $(MSG_DIR) && $(MAKE) $(@:-messages=) +install-systemd uninstall-systemd: + cd Autostart/Systemd && $(MAKE) $(@:-systemd=) + ARCHIVE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) TAR_EXTENSION = tar GZIP_EXTENSION = gz @@ -82,7 +85,14 @@ $(BIN_TAR_XZ): $(BIN_TAR) xz -9 -c $(BIN_TAR) >$@ bin-tar-xz: $(BIN_TAR_XZ) -ITERATE = -for directory in $(PGM_DIR) $(MSG_DIR) Android/Application; do (cd $$directory && $(MAKE) $@); done +ITERATE = \ + -for directory in \ + $(PGM_DIR) \ + $(MSG_DIR) \ + Autostart/Systemd \ + Android/Application \ + ; do (cd $$directory && $(MAKE) $@); done + clean:: $(ITERATE) -rm -f -- *.$(TAR_EXTENSION) *.$(GZIP_EXTENSION) *.$(BZIP2_EXTENSION) *.$(XZ_EXTENSION) *.$(ZIP_EXTENSION) *.rpm @@ -92,7 +102,7 @@ distclean:: clean -cd $(DOC_DIR) && $(MAKE) $@ $(ITERATE) -rm -f brltty.spec - -rm -f Autostart/Systemd/brltty.service + -rm -f Autostart/Systemd/brltty@.service -rm -fr autom4te*.cache -rm -f config.log config.cache config.status -rm -f config.mk config.h config.sh diff --git a/Messages/Makefile.in b/Messages/Makefile.in index 38e9c1a0b2f1d97bf0a5cba7aa6e3675b1873f14..5ec6fa3f2d69768d329e25b4059d2d8de65b3b98 100644 --- a/Messages/Makefile.in +++ b/Messages/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Messages/de.po b/Messages/de.po index c2f7abfd8a0864c7ef53a4c2bd0c9c774dd11fe3..d0024ef9ac4d1c6fa275f19cdb6aca88d1d6c72c 100644 --- a/Messages/de.po +++ b/Messages/de.po @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Messages/fr.po b/Messages/fr.po index 428afb163e7d8372320e2afb454c129113aab1d8..a6c42e143cafea545d69c5ec834007084af6790e 100644 --- a/Messages/fr.po +++ b/Messages/fr.po @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Messages/zh.po b/Messages/zh.po index d092a1d627f04cfc38ad772aaa23d5607540e096..1aca41d183e001a87c73c9d16e30ecfc3d7f8974 100644 --- a/Messages/zh.po +++ b/Messages/zh.po @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/Makefile.in b/Programs/Makefile.in index ea89a091c550179c4c89071ed104373513aa2b43..829d190535cfcf0dbf6c78a61d82bf1fce647430 100644 --- a/Programs/Makefile.in +++ b/Programs/Makefile.in @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -288,9 +288,15 @@ timing.$O: queue.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/queue.c +rabiables.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/rabiables.c + datafile.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/datafile.c +variables.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/variables.c + unicode.$O: $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/unicode.c @@ -305,7 +311,7 @@ pid.$O: ############################################################################### auth.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/auth.c + $(CC) $(LIBCFLAGS) $(POLKIT_INCLUDES) -c $(SRC_DIR)/auth.c dataarea.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/dataarea.c @@ -404,7 +410,7 @@ scr_menu.$O: ############################################################################### -ALERT_OBJECTS = alert.$O message.$O $(TUNE_OBJECTS) +ALERT_OBJECTS = alert.$O tune_build.$O message.$O $(TUNE_OBJECTS) alert.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/alert.c @@ -632,7 +638,7 @@ uninstall-api-bindings: ############################################################################### -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.$O cmd_brlapi.$O cmd_queue.$O cmd_utils.$O cmd_custom.$O cmd_navigation.$O cmd_input.$O cmd_keycodes.$O cmd_touch.$O cmd_toggle.$O cmd_preferences.$O cmd_clipboard.$O cmd_speech.$O cmd_learn.$O learn.$O cmd_miscellaneous.$O 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 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) @@ -667,6 +673,19 @@ update.$O: blink.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/blink.c +hidkeys.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/hidkeys.c + +drivers.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/drivers.c + +driver.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/driver.c + +############################################################################### + +CMD_OBJECTS = cmd.$O cmd_brlapi.$O cmd_queue.$O cmd_utils.$O cmd_clipboard.$O cmd_custom.$O cmd_input.$O cmd_keycodes.$O cmd_learn.$O cmd_miscellaneous.$O cmd_navigation.$O cmd_preferences.$O cmd_speech.$O cmd_toggle.$O cmd_touch.$O learn.$O + cmd.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd.c @@ -679,51 +698,42 @@ cmd_queue.$O: cmd_utils.$O: $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/cmd_utils.c +cmd_clipboard.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_clipboard.c + cmd_custom.$O: $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/cmd_custom.c -cmd_navigation.$O: - $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/cmd_navigation.c - cmd_input.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_input.c cmd_keycodes.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_keycodes.c -cmd_touch.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_touch.c +cmd_learn.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_learn.c -cmd_toggle.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_toggle.c +cmd_miscellaneous.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_miscellaneous.c + +cmd_navigation.$O: + $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/cmd_navigation.c cmd_preferences.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_preferences.c -cmd_clipboard.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_clipboard.c - cmd_speech.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_speech.c -cmd_learn.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_learn.c +cmd_toggle.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_toggle.c + +cmd_touch.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_touch.c learn.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/learn.c -cmd_miscellaneous.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/cmd_miscellaneous.c - -hidkeys.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/hidkeys.c - -drivers.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/drivers.c - -driver.$O: - $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/driver.c - ############################################################################### BRLTTY_OBJECTS = brltty.$O $(CORE_OBJECTS) diff --git a/Programs/activity.c b/Programs/activity.c index 96dd806f0e1c70a2c03608cf4cd89f5485cc2ef1..4988e691fc8e3ea68c11fff57621f0941dbf9228 100644 --- a/Programs/activity.c +++ b/Programs/activity.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/activity.h b/Programs/activity.h index e846659600050a831d80c1fcbef2d3dd2520b24a..20da2481226fee38a6c69133edf22b7f7137d5ba 100644 --- a/Programs/activity.h +++ b/Programs/activity.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/addresses.c b/Programs/addresses.c index 05b3736e518c8fbe9a7ad00d851901b2d94acdd4..b9b95ad6867286392d81e040c4be7aba10e8441d 100644 --- a/Programs/addresses.c +++ b/Programs/addresses.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/alert.c b/Programs/alert.c index 559255d28e2eb940b40ea5c89e7e36f5231f3503..fcbb4d27f56379f35f58f470ccae23890d0907b5 100644 --- a/Programs/alert.c +++ b/Programs/alert.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -19,269 +19,20 @@ #include "prologue.h" #include "alert.h" +#include "program.h" #include "prefs.h" #include "tune.h" +#include "tune_build.h" #include "message.h" #include "brl_dots.h" -static const NoteElement tuneBrailleOn[] = { - NOTE_PLAY( 60, 64), - NOTE_PLAY(100, 69), - NOTE_STOP() -}; - -static const NoteElement tuneBrailleOff[] = { - NOTE_PLAY( 60, 64), - NOTE_PLAY( 60, 57), - NOTE_STOP() -}; - -static const NoteElement tuneCommandDone[] = { - NOTE_PLAY( 40, 74), - NOTE_REST( 30), - NOTE_PLAY( 40, 74), - NOTE_REST( 40), - NOTE_PLAY(140, 74), - NOTE_REST( 20), - NOTE_PLAY( 50, 79), - NOTE_STOP() -}; - -static const NoteElement tuneCommandRejected[] = { - NOTE_PLAY(100, 78), - NOTE_STOP() -}; - -static const NoteElement tuneMarkSet[] = { - NOTE_PLAY( 20, 83), - NOTE_PLAY( 15, 81), - NOTE_PLAY( 15, 79), - NOTE_PLAY( 25, 84), - NOTE_STOP() -}; - -static const NoteElement tuneClipboardBegin[] = { - NOTE_PLAY( 40, 74), - NOTE_PLAY( 20, 86), - NOTE_STOP() -}; - -static const NoteElement tuneClipboardEnd[] = { - NOTE_PLAY( 50, 86), - NOTE_PLAY( 30, 74), - NOTE_STOP() -}; - -static const NoteElement tuneNoChange[] = { - NOTE_PLAY( 30, 79), - NOTE_REST( 30), - NOTE_PLAY( 30, 79), - NOTE_REST( 30), - NOTE_PLAY( 30, 79), - NOTE_STOP() -}; - -static const NoteElement tuneToggleOn[] = { - NOTE_PLAY( 30, 74), - NOTE_REST( 30), - NOTE_PLAY( 30, 79), - NOTE_REST( 30), - NOTE_PLAY( 30, 86), - NOTE_STOP() -}; - -static const NoteElement tuneToggleOff[] = { - NOTE_PLAY( 30, 86), - NOTE_REST( 30), - NOTE_PLAY( 30, 79), - NOTE_REST( 30), - NOTE_PLAY( 30, 74), - NOTE_STOP() -}; - -static const NoteElement tuneCursorLinked[] = { - NOTE_PLAY( 7, 80), - NOTE_PLAY( 7, 79), - NOTE_PLAY( 12, 76), - NOTE_STOP() -}; - -static const NoteElement tuneCursorUnlinked[] = { - NOTE_PLAY( 7, 78), - NOTE_PLAY( 7, 79), - NOTE_PLAY( 20, 83), - NOTE_STOP() -}; - -static const NoteElement tuneScreenFrozen[] = { - NOTE_PLAY( 5, 58), - NOTE_PLAY( 5, 59), - NOTE_PLAY( 5, 60), - NOTE_PLAY( 5, 61), - NOTE_PLAY( 5, 62), - NOTE_PLAY( 5, 63), - NOTE_PLAY( 5, 64), - NOTE_PLAY( 5, 65), - NOTE_PLAY( 5, 66), - NOTE_PLAY( 5, 67), - NOTE_PLAY( 5, 68), - NOTE_PLAY( 5, 69), - NOTE_PLAY( 5, 70), - NOTE_PLAY( 5, 71), - NOTE_PLAY( 5, 72), - NOTE_PLAY( 5, 73), - NOTE_PLAY( 5, 74), - NOTE_PLAY( 5, 76), - NOTE_PLAY( 5, 78), - NOTE_PLAY( 5, 80), - NOTE_PLAY( 5, 83), - NOTE_PLAY( 5, 86), - NOTE_PLAY( 5, 90), - NOTE_PLAY( 5, 95), - NOTE_STOP() -}; - -static const NoteElement tuneScreenUnfrozen[] = { - NOTE_PLAY( 5, 95), - NOTE_PLAY( 5, 90), - NOTE_PLAY( 5, 86), - NOTE_PLAY( 5, 83), - NOTE_PLAY( 5, 80), - NOTE_PLAY( 5, 78), - NOTE_PLAY( 5, 76), - NOTE_PLAY( 5, 74), - NOTE_PLAY( 5, 73), - NOTE_PLAY( 5, 72), - NOTE_PLAY( 5, 71), - NOTE_PLAY( 5, 70), - NOTE_PLAY( 5, 69), - NOTE_PLAY( 5, 68), - NOTE_PLAY( 5, 67), - NOTE_PLAY( 5, 66), - NOTE_PLAY( 5, 65), - NOTE_PLAY( 5, 64), - NOTE_PLAY( 5, 63), - NOTE_PLAY( 5, 62), - NOTE_PLAY( 5, 61), - NOTE_PLAY( 5, 60), - NOTE_PLAY( 5, 59), - NOTE_PLAY( 5, 58), - NOTE_STOP() -}; - -static const NoteElement tuneFreezeReminder[] = { - NOTE_PLAY( 50, 60), - NOTE_REST( 30), - NOTE_PLAY( 50, 60), - NOTE_STOP() -}; - -static const NoteElement tuneWrapDown[] = { - NOTE_PLAY( 6, 86), - NOTE_PLAY( 6, 74), - NOTE_PLAY( 6, 62), - NOTE_PLAY( 10, 50), - NOTE_STOP() -}; - -static const NoteElement tuneWrapUp[] = { - NOTE_PLAY( 6, 50), - NOTE_PLAY( 6, 62), - NOTE_PLAY( 6, 74), - NOTE_PLAY( 10, 86), - NOTE_STOP() -}; - -static const NoteElement tuneSkipFirst[] = { - NOTE_REST( 40), - NOTE_PLAY( 4, 62), - NOTE_PLAY( 6, 67), - NOTE_PLAY( 8, 74), - NOTE_REST( 25), - NOTE_STOP() -}; - -static const NoteElement tuneSkip[] = { - NOTE_PLAY( 10, 74), - NOTE_REST( 18), - NOTE_STOP() -}; - -static const NoteElement tuneSkipMore[] = { - NOTE_PLAY( 20, 73), - NOTE_REST( 1), - NOTE_STOP() -}; - -static const NoteElement tuneBounce[] = { - NOTE_PLAY( 6, 98), - NOTE_PLAY( 6, 86), - NOTE_PLAY( 6, 74), - NOTE_PLAY( 6, 62), - NOTE_PLAY( 10, 50), - NOTE_STOP() -}; - -static const NoteElement tuneRoutingStarted[] = { - NOTE_PLAY( 10, 55), - NOTE_REST( 60), - NOTE_PLAY( 15, 60), - NOTE_STOP() -}; - -static const NoteElement tuneRoutingSucceeded[] = { - NOTE_PLAY( 60, 64), - NOTE_PLAY( 20, 76), - NOTE_STOP() -}; - -static const NoteElement tuneRoutingFailed[] = { - NOTE_PLAY( 80, 80), - NOTE_PLAY( 90, 79), - NOTE_PLAY(100, 78), - NOTE_PLAY(100, 77), - NOTE_REST( 20), - NOTE_PLAY(100, 77), - NOTE_REST( 20), - NOTE_PLAY(150, 77), - NOTE_STOP() -}; - -static const NoteElement tuneModifierNext[] = { - NOTE_PLAY( 60, 72), - NOTE_PLAY( 60, 76), - NOTE_PLAY( 90, 79), - NOTE_STOP() -}; - -static const NoteElement tuneModifierOn[] = { - NOTE_PLAY( 60, 72), - NOTE_PLAY( 60, 76), - NOTE_PLAY( 60, 79), - NOTE_PLAY( 90, 84), - NOTE_STOP() -}; - -static const NoteElement tuneModifierOff[] = { - NOTE_PLAY( 60, 84), - NOTE_PLAY( 60, 79), - NOTE_PLAY( 60, 76), - NOTE_PLAY( 90, 72), - NOTE_STOP() -}; - -static const NoteElement tuneConsoleBell[] = { - NOTE_PLAY(100, 78), - NOTE_STOP() -}; - typedef struct { unsigned char duration; BrlDots pattern; } TactileAlert; typedef struct { - const NoteElement *tune; + const char *tune; const char *message; TactileAlert tactile; } AlertEntry; @@ -290,137 +41,204 @@ typedef struct { static const AlertEntry alertTable[] = { [ALERT_BRAILLE_ON] = { - .tune = tuneBrailleOn + .tune = "n64@60 n69@100" }, [ALERT_BRAILLE_OFF] = { - .tune = tuneBrailleOff + .tune = "n64@60 n57@60" }, [ALERT_COMMAND_DONE] = { .message = strtext("Done"), - .tune = tuneCommandDone + .tune = "n74@40 r@30 n74@40 r@40 n74@140 r@20 n79@50" }, [ALERT_COMMAND_REJECTED] = { .tactile = ALERT_TACTILE(50, BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6), - .tune = tuneCommandRejected + .tune = "n78@100" }, [ALERT_MARK_SET] = { - .tune = tuneMarkSet + .tune = "n83@20 n81@15 n79@15 n84@25" }, [ALERT_CLIPBOARD_BEGIN] = { - .tune = tuneClipboardBegin + .tune = "n74@40 n86@20" }, [ALERT_CLIPBOARD_END] = { - .tune = tuneClipboardEnd + .tune = "n86@50 n74@30" }, [ALERT_NO_CHANGE] = { .tactile = ALERT_TACTILE(30, BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6), - .tune = tuneNoChange + .tune = "n79@30 r@30 n79@30 r@30 n79@30" }, [ALERT_TOGGLE_ON] = { .tactile = ALERT_TACTILE(30, BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5), - .tune = tuneToggleOn + .tune = "n74@30 r@30 n79@30 r@30 n86@30" }, [ALERT_TOGGLE_OFF] = { .tactile = ALERT_TACTILE(30, BRL_DOT_3 | BRL_DOT_7 | BRL_DOT_6 | BRL_DOT_8), - .tune = tuneToggleOff + .tune = "n86@30 r@30 n79@30 r@30 n74@30" }, [ALERT_CURSOR_LINKED] = { - .tune = tuneCursorLinked + .tune = "n80@7 n79@7 n76@12" }, [ALERT_CURSOR_UNLINKED] = { - .tune = tuneCursorUnlinked + .tune = "n78@7 n79@7 n83@20" }, [ALERT_SCREEN_FROZEN] = { .message = strtext("Frozen"), - .tune = tuneScreenFrozen + .tune = "n58@5 n59 n60 n61 n62 n63 n64 n65 n66 n67 n68 n69 n70 n71 n72 n73 n74 n76 n78 n80 n83 n86 n90 n95" }, [ALERT_SCREEN_UNFROZEN] = { .message = strtext("Unfrozen"), - .tune = tuneScreenUnfrozen + .tune = "n95@5 n90 n86 n83 n80 n78 n76 n74 n73 n72 n71 n70 n69 n68 n67 n66 n65 n64 n63 n62 n61 n60 n59 n58" }, [ALERT_FREEZE_REMINDER] = { - .tune = tuneFreezeReminder + .tune = "n60@50 r@30 n60@50" }, [ALERT_WRAP_DOWN] = { .tactile = ALERT_TACTILE(20, BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6 | BRL_DOT_8), - .tune = tuneWrapDown + .tune = "n86@6 n74@6 n62@6 n50@10" }, [ALERT_WRAP_UP] = { .tactile = ALERT_TACTILE(20, BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_7), - .tune = tuneWrapUp + .tune = "n50@6 n62@6 n74@6 n86@10" }, [ALERT_SKIP_FIRST] = { .tactile = ALERT_TACTILE(30, BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_7 | BRL_DOT_8), - .tune = tuneSkipFirst + .tune = "r@40 n62@4 n67@6 n74@8 r@25" }, - [ALERT_SKIP] = { - .tune = tuneSkip + [ALERT_SKIP_ONE] = { + .tune = "n74@10 r@18" }, - [ALERT_SKIP_MORE] = { - .tune = tuneSkipMore + [ALERT_SKIP_SEVERAL] = { + .tune = "n73@20 r@1" }, [ALERT_BOUNCE] = { .tactile = ALERT_TACTILE(50, BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6 | BRL_DOT_7 | BRL_DOT_8), - .tune = tuneBounce + .tune = "n98@6 n86@6 n74@6 n62@6 n50@10" }, [ALERT_ROUTING_STARTED] = { - .tune = tuneRoutingStarted + .tune = "n55@10 r@60 n60@15" }, [ALERT_ROUTING_SUCCEEDED] = { - .tune = tuneRoutingSucceeded + .tune = "n64@60 n76@20" }, [ALERT_ROUTING_FAILED] = { - .tune = tuneRoutingFailed + .tune = "n80@80 n79@90 n78@100 n77@100 r@20 n77@100 r@20 n77@150" }, [ALERT_MODIFIER_NEXT] = { - .tune = tuneModifierNext + .tune = "n72@60 n76@60 n79@90" }, [ALERT_MODIFIER_ON] = { - .tune = tuneModifierOn + .tune = "n72@60 n76@60 n79@60 n84@90" }, [ALERT_MODIFIER_OFF] = { - .tune = tuneModifierOff + .tune = "n84@60 n79@60 n76@60 n72@90" }, [ALERT_CONSOLE_BELL] = { .message = strtext("Console Bell"), - .tune = tuneConsoleBell + .tune = "n78@100" + }, + + [ALERT_KEYS_AUTORELEASED] = { + .message = strtext("Autorelease"), + .tune = "c6@50 b- g e- p50 c@100 c c" }, }; +static ToneElement *tuneTable[ARRAY_COUNT(alertTable)] = {NULL}; +static TuneBuilder *tuneBuilder = NULL; +static ToneElement emptyTune[] = {TONE_STOP()}; + +static void +exitAlertTunes (void *data) { + tuneSynchronize(); + + { + ToneElement **tune = tuneTable; + ToneElement **end = tune + ARRAY_COUNT(tuneTable); + + while (tune < end) { + if (*tune) { + if (*tune != emptyTune) free(*tune); + *tune = NULL; + } + + tune += 1; + } + } + + if (tuneBuilder) { + destroyTuneBuilder(tuneBuilder); + tuneBuilder = NULL; + } +} + +static TuneBuilder * +getTuneBuilder (void) { + if (!tuneBuilder) { + if (!(tuneBuilder = newTuneBuilder())) { + return NULL; + } + + onProgramExit("alert-tunes", exitAlertTunes, NULL); + } + + return tuneBuilder; +} + void alert (AlertIdentifier identifier) { if (identifier < ARRAY_COUNT(alertTable)) { const AlertEntry *alert = &alertTable[identifier]; - if (prefs.alertTunes && alert->tune) { - tunePlayNotes(alert->tune); + if (prefs.alertTunes && alert->tune && *alert->tune) { + ToneElement **tune = &tuneTable[identifier]; + + if (!*tune) { + TuneBuilder *tb = getTuneBuilder(); + + if (tb) { + setTuneSourceName(tuneBuilder, "alert"); + setTuneSourceIndex(tb, identifier); + + if (parseTuneString(tb, "p100")) { + if (parseTuneString(tb, alert->tune)) { + *tune = getTune(tb); + } + } + + resetTuneBuilder(tb); + } + + if (!*tune) *tune = emptyTune; + } + + tunePlayTones(*tune); } else if (prefs.alertDots && alert->tactile.duration) { showDotPattern(alert->tactile.pattern, alert->tactile.duration); } else if (prefs.alertMessages && alert->message) { diff --git a/Programs/api.h b/Programs/api.h index dc5534e77e219bd1c3f999bc54ededb2a737ad70..2803fccc66269cc1d0b56cb75a9cd912790734b5 100644 --- a/Programs/api.h +++ b/Programs/api.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/api_control.c b/Programs/api_control.c index ce45297a714ea940db6ba3485252953c2605acad..90df4ca2139054c8aec70b55640f7dc3a01f175f 100644 --- a/Programs/api_control.c +++ b/Programs/api_control.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -82,6 +82,7 @@ api_flush (BrailleDisplay *brl) { #endif /* ENABLE_API */ static int apiStarted = 0; +static int apiLinked = 0; static int driverClaimed = 0; static void @@ -117,12 +118,23 @@ apiIsStarted (void) { static void apiLink (void) { - if (apiStarted) api_link(&brl); + if (apiStarted) { + api_link(&brl); + apiLinked = 1; + } } static void apiUnlink (void) { - if (apiStarted) api_unlink(&brl); + if (apiStarted) { + api_unlink(&brl); + apiLinked = 0; + } +} + +static int +apiIsLinked (void) { + return apiLinked; } static void @@ -193,6 +205,7 @@ const ApiMethods api = { .link = apiLink, .unlink = apiUnlink, + .isLinked = apiIsLinked, .suspend = apiSuspend, .resume = apiResume, diff --git a/Programs/api_control.h b/Programs/api_control.h index 125c49f3c6835886bd865bc820f3135e5ac35cd0..a0752c29c6ffded7ae6f03c7300f6b2c045bf6bb 100644 --- a/Programs/api_control.h +++ b/Programs/api_control.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/api_server.h b/Programs/api_server.h index 9de55151617b09fee58b856e3b94de04179a0f20..74939d240f4a58d0dacc840bc4d0dc2778a95525 100644 --- a/Programs/api_server.h +++ b/Programs/api_server.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/apitest.c b/Programs/apitest.c index 79b3e3f36c2225cc2cdee9877609e02bfa63866b..2e89cbc4c55080f52fb7ee7501d3bcf172cace10 100644 --- a/Programs/apitest.c +++ b/Programs/apitest.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_alarm.c b/Programs/async_alarm.c index c9a57a9ec270e0e921b344037952c3998d2ffa83..6da45474f0e658ea6eb2d4bf89b729e07cb92ca9 100644 --- a/Programs/async_alarm.c +++ b/Programs/async_alarm.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_data.c b/Programs/async_data.c index bfcc761f7d3cf62dce0e3534450675e8894c6014..e9c5d58d5044c6b87fcf806c456ffe60bebc85c2 100644 --- a/Programs/async_data.c +++ b/Programs/async_data.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_event.c b/Programs/async_event.c index 9848a4e425d85f89f4c07490f6c998403b2aae80..b9e68e3efab4078a75ddd444be956d1ac60eed02 100644 --- a/Programs/async_event.c +++ b/Programs/async_event.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_handle.c b/Programs/async_handle.c index 7094ca6908a58280ca29b2771c50eb701229c901..b1ecaa5dae1ed4de5320e76936e4568bd5e00110 100644 --- a/Programs/async_handle.c +++ b/Programs/async_handle.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_internal.h b/Programs/async_internal.h index d3ffd2cefea89e2e51a3dfd478fbe3cce5fbf7d1..5804fba42d07fd7a143a99a3ca37b81973187e11 100644 --- a/Programs/async_internal.h +++ b/Programs/async_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_io.c b/Programs/async_io.c index 771ca49faaf8b3309c6b3368b1055baeb96f2eb3..28ea2ad31ea5a928474acb877bd36ee6ed4da4f8 100644 --- a/Programs/async_io.c +++ b/Programs/async_io.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_signal.c b/Programs/async_signal.c index 588834d2c5bc452aa14763a212fcadce7f180dd1..412f476be9fd7d67b99831a30d6898fe7aa65ef8 100644 --- a/Programs/async_signal.c +++ b/Programs/async_signal.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_task.c b/Programs/async_task.c index 6cab71b128488d6a3ed17eed8b3da0bb68b4048d..3743e420523b65b14ddd450a68171379b2b880d1 100644 --- a/Programs/async_task.c +++ b/Programs/async_task.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/async_wait.c b/Programs/async_wait.c index 86e41350333dad239174bbee8ff0ede9fb331818..71b137238315f8b114a89ac929f70bd8f063a479 100644 --- a/Programs/async_wait.c +++ b/Programs/async_wait.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -142,13 +142,20 @@ awaitAction (long int timeout) { int asyncAwaitCondition (int timeout, AsyncConditionTester *testCondition, void *data) { + int first = 1; TimePeriod period; startTimePeriod(&period, timeout); while (!(testCondition && testCondition(data))) { long int elapsed; - if (afterTimePeriod(&period, &elapsed)) return 0; + if (first) { + first = 0; + elapsed = 0; + } else if (afterTimePeriod(&period, &elapsed)) { + return 0; + } + awaitAction(timeout - elapsed); } diff --git a/Programs/atb_compile.c b/Programs/atb_compile.c index 20cf7ba186f9b6dfa59cf5a344c055c78c8468c8..a6e126f479a4b1cd5038fca746c9ae21a841c686 100644 --- a/Programs/atb_compile.c +++ b/Programs/atb_compile.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -152,7 +152,7 @@ static DATA_OPERANDS_PROCESSOR(processDotOperands) { return 1; } -static DATA_OPERANDS_PROCESSOR(processAttributesTableLine) { +static DATA_OPERANDS_PROCESSOR(processAttributesTableOperands) { BEGIN_DATA_DIRECTIVE_TABLE DATA_NESTING_DIRECTIVES, {.name=WS_C("dot"), .processor=processDotOperands}, @@ -171,7 +171,12 @@ compileAttributesTable (const char *name) { if ((atd.area = newDataArea())) { if (allocateDataItem(atd.area, NULL, sizeof(AttributesTableHeader), __alignof__(AttributesTableHeader))) { - if (processDataFile(name, processAttributesTableLine, &atd)) { + const DataFileParameters parameters = { + .processOperands = processAttributesTableOperands, + .data = &atd + }; + + if (processDataFile(name, ¶meters)) { if (makeAttributesToDots(&atd)) { if ((table = malloc(sizeof(*table)))) { table->header.fields = getAttributesTableHeader(&atd); diff --git a/Programs/atb_internal.h b/Programs/atb_internal.h index 55469b49d96ba74ac116b8ac27459744ec51e51c..d8ba7a1fb5344adbbc99c037fb1a7f878821cbfc 100644 --- a/Programs/atb_internal.h +++ b/Programs/atb_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/atb_translate.c b/Programs/atb_translate.c index 9fff0c8ab425623f8d5fd2ab2920decc099cc016..41f93345ce5362e1e66131534ae0a248aef42b63 100644 --- a/Programs/atb_translate.c +++ b/Programs/atb_translate.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/auth.c b/Programs/auth.c index 11ebb77e43e116da82191316832ed2a8c1cebce0..f93afad66cdddb7fac901b8e1b726dc6f5fd01bc 100644 --- a/Programs/auth.c +++ b/Programs/auth.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -437,6 +437,88 @@ authGroup_server (AuthDescriptor *auth, FileDescriptor fd, void *data) { return getPeerCredentials(auth, fd) && checkPeerGroup(&auth->peerCredentials, group); } + +#ifdef USE_POLKIT +#include + +typedef struct { + PolkitAuthority *authority; +} MethodDescriptor_polkit; + +static void * +authPolkit_initialize (const char *parameter) { + MethodDescriptor_polkit *polkit; + + if ((polkit = malloc(sizeof(*polkit)))) { + memset(polkit, 0, sizeof(*polkit)); + + 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); + } + } else { + logMallocError(); + } + + return NULL; +} + +static void +authPolkit_release (void *data) { + MethodDescriptor_polkit *polkit = data; + g_object_unref (polkit->authority); + free(polkit); +} + +static int +authPolkit_server (AuthDescriptor *auth, FileDescriptor fd, void *data) { + MethodDescriptor_polkit *polkit = data; + + struct ucred cred; + socklen_t length = sizeof(cred); + + if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &length) != -1) { + logMessage(LOG_DEBUG, "attempting to authenticate pid %d via polkit", cred.pid); + + PolkitSubject *subject = polkit_unix_process_new_for_owner(cred.pid, -1, cred.uid); + if (subject) { + GError *error_local = NULL; + + PolkitAuthorizationResult *result = polkit_authority_check_authorization_sync( + polkit->authority, /* authority */ + subject, /* PolkitSubject for client */ + "org.brltty.write-display", /* name of polkit action */ + NULL, /* details */ + POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, /* disallow interaction */ + NULL, /* GCancellable */ + &error_local /* returned error */ + ); + + if (result) { + int isAuthorized = polkit_authorization_result_get_is_authorized(result); + g_object_unref(result); + + logMessage(LOG_DEBUG, "polkit_authority_check_authorization_sync returned %d", isAuthorized); + return isAuthorized; + } else { + logSystemError("polkit_authority_check_authorization_sync"); + g_error_free(error_local); + } + } else { + logSystemError("polkit_unix_process_new_for_owner"); + } + } else { + logSystemError("getsockopt[SO_PEERCRED]"); + } + + return 0; +} +#endif /* USE_POLKIT */ #endif /* CAN_CHECK_CREDENTIALS */ /* general functions */ @@ -463,6 +545,15 @@ static const MethodDefinition methodDefinitions[] = { .client = NULL, .server = authGroup_server }, + +#ifdef USE_POLKIT + { .name = "polkit", + .initialize = authPolkit_initialize, + .release = authPolkit_release, + .client = NULL, + .server = authPolkit_server + }, +#endif /* USE_POLKIT */ #endif /* CAN_CHECK_CREDENTIALS */ {.name = NULL} diff --git a/Programs/beep.c b/Programs/beep.c index c0866e4ea801ee570bbb5f078bb07418637d647c..f01c2b0f4e3a0862a260097802fd7f6925b4bc87 100644 --- a/Programs/beep.c +++ b/Programs/beep.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_linux.c b/Programs/beep_linux.c index ba663b86ce83eb303f75b9a94dfe23e9efa58f4f..c62d0f7d34f3d33b9957ef52422b154228a7a267 100644 --- a/Programs/beep_linux.c +++ b/Programs/beep_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_msdos.c b/Programs/beep_msdos.c index 26b75fd359fb3dcde8168913f3c917e4f2189224..1ad79c811d68492e3eb2ed380eaa83e197f829b4 100644 --- a/Programs/beep_msdos.c +++ b/Programs/beep_msdos.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_none.c b/Programs/beep_none.c index 393982c8f5075be7ebc3e64f6b4e33540a795512..d78b5c58434adb8173530a0c3f5761e1dbd40691 100644 --- a/Programs/beep_none.c +++ b/Programs/beep_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_solaris.c b/Programs/beep_solaris.c index f6e6ed907e6846579ca72127de87de6cba748250..0c8a3fba0a7d7771f312a2e6a8f11cb6c87e5407 100644 --- a/Programs/beep_solaris.c +++ b/Programs/beep_solaris.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_spkr.c b/Programs/beep_spkr.c index 5b1e78b8a6530f53f59fcd1912d2a037293059fc..b914894db8ab7e62b3e2c7277bc3a9bd138272f2 100644 --- a/Programs/beep_spkr.c +++ b/Programs/beep_spkr.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_windows.c b/Programs/beep_windows.c index 63ae3daa4ce913fd8c83a0ef0039453f36151434..9936037e7d72088c9eb0dfba9adb8da6688a9d90 100644 --- a/Programs/beep_windows.c +++ b/Programs/beep_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/beep_wskbd.c b/Programs/beep_wskbd.c index 5229dd6a8b7db001c684747ee3f860d14b78a685..30965b50d1955075b81f31dbc3d4d21eaf20dd38 100644 --- a/Programs/beep_wskbd.c +++ b/Programs/beep_wskbd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bell.c b/Programs/bell.c index 3fd44b6cf6b53ff121f3f33f5be87444a2596dc8..d7d65af267048eaf3abdeb3a642ec74fc5f2fb97 100644 --- a/Programs/bell.c +++ b/Programs/bell.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bell_linux.c b/Programs/bell_linux.c index d667120b6e47cde60fa638a7ddeec89c275eff28..df45fccda2f4e7ec2e6cabe48dd29a504e161061 100644 --- a/Programs/bell_linux.c +++ b/Programs/bell_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bell_none.c b/Programs/bell_none.c index b3abeb70d3a8929d44199507a254df18fc63fcf2..58383138395d42855155d0fe7620473e24be72c1 100644 --- a/Programs/bell_none.c +++ b/Programs/bell_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/blink.c b/Programs/blink.c index 7126e5094c32ed2644e250f75248a837d68ed30a..967b8fcb4582681bb24baa49e4b0a5d92a7547b5 100644 --- a/Programs/blink.c +++ b/Programs/blink.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/blink.h b/Programs/blink.h index 45d3bc1b05f3bd22b5c3856b5a9a1a11a253d61f..35901d4763299dfb584de5c7768cc242abbb712c 100644 --- a/Programs/blink.h +++ b/Programs/blink.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth.c b/Programs/bluetooth.c index 0bec47901e8a6902324a9858f9736360b45ee222..cdcc9d60a85819796fa910147654eead63965d28 100644 --- a/Programs/bluetooth.c +++ b/Programs/bluetooth.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth_android.c b/Programs/bluetooth_android.c index 51d533a4703f12f6f4e7abd1c3243c86115d820d..b46992ca3149bb18d8830d9f0b066e5039b96b9f 100644 --- a/Programs/bluetooth_android.c +++ b/Programs/bluetooth_android.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth_darwin.c b/Programs/bluetooth_darwin.c index e155f117399dd5cdfe2fd522bd2bf61825a8e984..3f4948586274103edde12f1d83348c034bd9c844 100644 --- a/Programs/bluetooth_darwin.c +++ b/Programs/bluetooth_darwin.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth_internal.h b/Programs/bluetooth_internal.h index 9fd91994ef351263b1aeab77616dd7881eecfb5e..71c47550cc96f9aa67de1f00f82dbf9a1bdb32c6 100644 --- a/Programs/bluetooth_internal.h +++ b/Programs/bluetooth_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth_linux.c b/Programs/bluetooth_linux.c index 16b9c86febb91536c0d09599761d5843db632379..5f41a4d0ae83b3572162bfb01a40cace9baa5830 100644 --- a/Programs/bluetooth_linux.c +++ b/Programs/bluetooth_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth_names.c b/Programs/bluetooth_names.c index 2300d40cbd59bebb1cf0b3620ab3cf949669f284..d644d558fe8436e0722d532d25f5616b82a86689 100644 --- a/Programs/bluetooth_names.c +++ b/Programs/bluetooth_names.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -37,7 +37,8 @@ BLUETOOTH_NAME_DRIVERS(BrailleSense, "hm"); BLUETOOTH_NAME_DRIVERS(BrailleStar, "ht"); BLUETOOTH_NAME_DRIVERS(Braillex, "pm"); BLUETOOTH_NAME_DRIVERS(BrailliantBI, "hw"); -BLUETOOTH_NAME_DRIVERS(Brailliant, "bm"); +BLUETOOTH_NAME_DRIVERS(Brailliant80, "hw"); +BLUETOOTH_NAME_DRIVERS(B2G, "bm"); BLUETOOTH_NAME_DRIVERS(Conny, "bm"); BLUETOOTH_NAME_DRIVERS(EL12, "al", "vo"); BLUETOOTH_NAME_DRIVERS(Focus, "fs"); @@ -115,8 +116,12 @@ const BluetoothNameEntry bluetoothNameTable[] = { .driverCodes = bluetoothNameDrivers_BrailliantBI }, - { .namePrefix = "Brailliant", - .driverCodes = bluetoothNameDrivers_Brailliant + { .namePrefix = "Brailliant 80", + .driverCodes = bluetoothNameDrivers_Brailliant80 + }, + + { .namePrefix = "B2G", + .driverCodes = bluetoothNameDrivers_B2G }, { .namePrefix = "Conny", diff --git a/Programs/bluetooth_none.c b/Programs/bluetooth_none.c index f5b51f415ab5153668c085a94ac51ca543183b8d..9df041592b74926be46dcedb490380ac2fc4a2f0 100644 --- a/Programs/bluetooth_none.c +++ b/Programs/bluetooth_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/bluetooth_windows.c b/Programs/bluetooth_windows.c index 96790afedac30778c3e37e642eb5ec3824ca3123..48691692f10d7149c4ccde54f6b6f335db38922d 100644 --- a/Programs/bluetooth_windows.c +++ b/Programs/bluetooth_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brl.c b/Programs/brl.c index e40ef7099eade3d3f0a3280f945bab7bb36d438c..f9985a735104b829d3806ba1d493f788a9a7aef9 100644 --- a/Programs/brl.c +++ b/Programs/brl.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brl.h b/Programs/brl.h index 7659f7c83e74248c584ff9f81b29713e758ee3e5..2d1b5aae566452a3de2dc2276b746d4b74e02bf6 100644 --- a/Programs/brl.h +++ b/Programs/brl.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brl_base.c b/Programs/brl_base.c index e344789b1b374b37fe811b7624251762ce0b031c..6b9b9605bfcc245c4658d6c6ec890288e54d1719 100644 --- a/Programs/brl_base.c +++ b/Programs/brl_base.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -214,22 +214,21 @@ readBraillePacket ( unsigned char *bytes = packet; size_t count = 0; size_t length = 1; + int started = 0; if (!endpoint) endpoint = brl->gioEndpoint; while (1) { unsigned char byte; - { - int started = count > 0; - - if (!gioReadByte(endpoint, &byte, started)) { - if (started) logPartialPacket(bytes, count); - return 0; - } + if (!gioReadByte(endpoint, &byte, started)) { + if (count > 0) logPartialPacket(bytes, count); + return 0; } gotByte: + started = 1; + if (count < size) { bytes[count++] = byte; @@ -245,6 +244,8 @@ readBraillePacket ( default: logMessage(LOG_WARNING, "unimplemented braille packet verifier result: %u", result); case BRL_PVR_INVALID: + started = 0; + if (--count) { logShortPacket(bytes, count); count = 0; diff --git a/Programs/brl_cmds.awk b/Programs/brl_cmds.awk index 11285db4215e99b8b8cb2f35bf964f42a97493d1..93e3671b6445977f543463bd5925f33d95c6ac68 100644 --- a/Programs/brl_cmds.awk +++ b/Programs/brl_cmds.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/brl_driver.c b/Programs/brl_driver.c index 275341bc788503331ba9829f43c5372b4067bb5e..9d049ea7abf2a1c645d7f2d744455ff784bca14e 100644 --- a/Programs/brl_driver.c +++ b/Programs/brl_driver.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brl_input.c b/Programs/brl_input.c index 62f3af5a3f0a4ea29a906136698e8016871f9291..b361e8ae3f639243bb679e5d9ec585ab538fc3cc 100644 --- a/Programs/brl_input.c +++ b/Programs/brl_input.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brl_input.h b/Programs/brl_input.h index 62f53214fe15cd64f4633a55a92c6001e642fb10..2b983cf35381095e3e13b1ae614b7aef4365e84c 100644 --- a/Programs/brl_input.h +++ b/Programs/brl_input.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brl_utils.c b/Programs/brl_utils.c index b4e400da6b89cf8f83e63af567efc9b68fa99ac9..16c5cf36a669da74c27426a079cc3435bd7a6e59 100644 --- a/Programs/brl_utils.c +++ b/Programs/brl_utils.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brlapi.awk b/Programs/brlapi.awk index 864a7bec7769c856f67ba03b4f4034fe6730db3c..890cb86c2c87abe60d2cc16af3cbddd682b1ce1d 100644 --- a/Programs/brlapi.awk +++ b/Programs/brlapi.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/brlapi.h.in b/Programs/brlapi.h.in index 2801992f458ef96b4919e9699c5765d62ac08eeb..ab88f70ddc2f701bd1a9c04357f2ff3a3679c9c9 100644 --- a/Programs/brlapi.h.in +++ b/Programs/brlapi.h.in @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Programs/brlapi_brldefs.awk b/Programs/brlapi_brldefs.awk index 41eacd875850fb278980f110d69fa68597b0c060..0eaa0148152616154f76ebed13f28c2e3390b0a7 100644 --- a/Programs/brlapi_brldefs.awk +++ b/Programs/brlapi_brldefs.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c index 3c9182a24cbdbdc7d3fcfd575bee18a4cf3d2d86..0e20ec1342f1dad243ab248ab04d562da654156b 100644 --- a/Programs/brlapi_client.c +++ b/Programs/brlapi_client.c @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Programs/brlapi_common.h b/Programs/brlapi_common.h index 8c88ec1951ea3f82229340bf97b4f08d9240e7eb..98fed095e2b6d60dbb796e26107b7543bbee77ad 100644 --- a/Programs/brlapi_common.h +++ b/Programs/brlapi_common.h @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Programs/brlapi_constants.awk b/Programs/brlapi_constants.awk index 961f88dcfa31fad75996741ef91cd959d7b9e3d3..0d3894aaecc67ee31b901d842739d72906fcddf4 100644 --- a/Programs/brlapi_constants.awk +++ b/Programs/brlapi_constants.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/brlapi_keycodes.h b/Programs/brlapi_keycodes.h index f4939f3dbc8080fdf8d85379369b21df06ea42fb..17af9cf035b97ab85a74b3495ba2d8972420243e 100644 --- a/Programs/brlapi_keycodes.h +++ b/Programs/brlapi_keycodes.h @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Programs/brlapi_keyranges.c b/Programs/brlapi_keyranges.c index 23d7cc261a75cf147f53cd0588b4259ffec6fe03..ed0299f3ed26ab01843ffb1eb8b02eaefa7bd3bf 100644 --- a/Programs/brlapi_keyranges.c +++ b/Programs/brlapi_keyranges.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brlapi_keyranges.h b/Programs/brlapi_keyranges.h index cee69b3c7a459e4ae9c3df2fc8cb9af35000f1c6..2c80b8dc3dcbf2cbae4c3b8ee307dfe60f7cc16d 100644 --- a/Programs/brlapi_keyranges.h +++ b/Programs/brlapi_keyranges.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brlapi_keytab.awk b/Programs/brlapi_keytab.awk index 81a487f3914063587655145a752d54fb85cde7e0..3608985611666e842ab0094534cc8bbb19c27759 100644 --- a/Programs/brlapi_keytab.awk +++ b/Programs/brlapi_keytab.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/brlapi_protocol.h b/Programs/brlapi_protocol.h index 9fb8bf6f6a78518e0e74db52b66bf99478f25445..55a90bf2b7fd683477aab630eeb5a9e2b4998827 100644 --- a/Programs/brlapi_protocol.h +++ b/Programs/brlapi_protocol.h @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2015 by + * Copyright (C) 2002-2016 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c index 3b5fc750040a708ea9cc1164154f3c52a4e15afd..43d21169b6d88ce92b88a8d8811a51199fc02ef3 100644 --- a/Programs/brlapi_server.c +++ b/Programs/brlapi_server.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -117,7 +117,7 @@ static size_t stackSize; static AsyncEvent *flushEvent; #define RELEASE "BrlAPI Server: release " BRLAPI_RELEASE -#define COPYRIGHT " Copyright (C) 2002-2015 by Sébastien Hinderer , \ +#define COPYRIGHT " Copyright (C) 2002-2016 by Sébastien Hinderer , \ Samuel Thibault " #define WERR(x, y, ...) do { \ diff --git a/Programs/brldefs.h b/Programs/brldefs.h index ea525bec587aee2443cc6e6ebefd9fc6d4a39c54..6e6b559e493ae81c23e68cf4f5c399e3f17c7105 100644 --- a/Programs/brldefs.h +++ b/Programs/brldefs.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brltest.c b/Programs/brltest.c index c1f0b8077ac076cc7949b765cb9d453a35818eca..22fef5a3eca38ef986cde9af51c104932552f2db 100644 --- a/Programs/brltest.c +++ b/Programs/brltest.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,10 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* brltest.c - Test progrm for the Braille display library - * $Id: brltest.c,v 1.3 1996/09/24 01:04:24 nn201 Exp $ - */ - #include "prologue.h" #include @@ -292,7 +288,15 @@ message (const char *mode, const char *text, MessageOptions options) { return 1; } +#include "scr.h" + KeyTableCommandContext getScreenCommandContext (void) { return KTB_CTX_DEFAULT; } + +#include "alert.h" + +void +alert (AlertIdentifier identifier) { +} diff --git a/Programs/brltty-atb.c b/Programs/brltty-atb.c index e0c64e0ec23478e209de62eee7ce74a5110a5571..a4fa3dff7cf0ee5a9cff33b84c95f4a5cd854523 100644 --- a/Programs/brltty-atb.c +++ b/Programs/brltty-atb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brltty-ctb.c b/Programs/brltty-ctb.c index 0b8a4265d64a2606a79ba72e180ec6cb0a6e67e8..30beae462078ae88f63405f087f732b48fc477c5 100644 --- a/Programs/brltty-ctb.c +++ b/Programs/brltty-ctb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,10 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* tbl2hex.c - filter to compile 256-byte table file into C code - * $Id: tbl2hex.c,v 1.3 1996/09/24 01:04:25 nn201 Exp $ - */ - #include "prologue.h" #include @@ -400,7 +396,7 @@ static DATA_OPERANDS_PROCESSOR(processContractsOperands) { return 0; } -static DATA_OPERANDS_PROCESSOR(processVerificationLine) { +static DATA_OPERANDS_PROCESSOR(processVerificationOperands) { BEGIN_DATA_DIRECTIVE_TABLE {.name=WS_C("contracts"), .processor=processContractsOperands}, END_DATA_DIRECTIVE_TABLE @@ -411,7 +407,12 @@ static DATA_OPERANDS_PROCESSOR(processVerificationLine) { static ProgramExitStatus processVerificationTable (void) { if (setTableDataVariables(VERIFICATION_TABLE_EXTENSION, VERIFICATION_SUBTABLE_EXTENSION)) { - if (processDataStream(NULL, verificationTableStream, verificationTablePath, processVerificationLine, NULL)) { + const DataFileParameters parameters = { + .processOperands = processVerificationOperands, + .data = NULL + }; + + if (processDataStream(NULL, verificationTableStream, verificationTablePath, ¶meters)) { return PROG_EXIT_SUCCESS; } } @@ -419,34 +420,10 @@ processVerificationTable (void) { return PROG_EXIT_FATAL; } -static int -processInputLine (char *line, void *data) { - const char *string = line; - size_t length = strlen(string); - const char *byte = string; - - size_t count = length + 1; - wchar_t characters[count]; - wchar_t *character = characters; - - convertUtf8ToWchars(&byte, &character, count); - length = character - characters; - - return processInputCharacters(characters, length, data); -} - -static ProgramExitStatus -processInputStream (FILE *stream) { - LineProcessingData lpd = { - .exitStatus = PROG_EXIT_SUCCESS - }; - ProgramExitStatus exitStatus = processLines(stream, processInputLine, &lpd)? lpd.exitStatus: PROG_EXIT_FATAL; - - if (exitStatus == PROG_EXIT_SUCCESS) - if (!(flushCharacters('\n', &lpd) && flushOutputStream(&lpd))) - exitStatus = lpd.exitStatus; - - return exitStatus; +static DATA_OPERANDS_PROCESSOR(processInputLine) { + DataOperand line; + getTextRemaining(file, &line); + return processInputCharacters(line.characters, line.length, data); } int @@ -525,27 +502,26 @@ main (int argc, char *argv[]) { } if (exitStatus == PROG_EXIT_SUCCESS) { - if (argc) { - do { - char *path = *argv; - if (strcmp(path, standardStreamArgument) == 0) { - exitStatus = processInputStream(stdin); - } else { - FILE *stream = fopen(path, "r"); - if (stream) { - exitStatus = processInputStream(stream); - fclose(stream); - } else { - logMessage(LOG_ERR, "cannot open input file: %s: %s", - path, strerror(errno)); - exitStatus = PROG_EXIT_FATAL; - } - } - } while ((exitStatus == PROG_EXIT_SUCCESS) && (++argv, --argc)); - } else if (verificationTableStream) { + if (verificationTableStream && !argc) { exitStatus = processVerificationTable(); } else { - exitStatus = processInputStream(stdin); + LineProcessingData lpd = { + .exitStatus = PROG_EXIT_SUCCESS + }; + + const InputFilesProcessingParameters parameters = { + .dataFileParameters = { + .options = DFO_NO_COMMENTS, + .processOperands = processInputLine, + .data = &lpd + } + }; + + if ((exitStatus = processInputFiles(argv, argc, ¶meters)) == PROG_EXIT_SUCCESS) { + if (!(flushCharacters('\n', &lpd) && flushOutputStream(&lpd))) { + exitStatus = lpd.exitStatus; + } + } } if (textTable) destroyTextTable(textTable); diff --git a/Programs/brltty-genkey b/Programs/brltty-genkey index 2f50a4fabb668cb94cfb9bdbe560351a1d528629..b4c28cc6442f6a2335ad2bee7977815d52243a60 100755 --- a/Programs/brltty-genkey +++ b/Programs/brltty-genkey @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/brltty-ktb b/Programs/brltty-ktb index 32ddc10802214c25ac4e44c963ed94e76db061a1..7ccf14243dfc447e64e0733f4e2df76fffc3a1ed 100755 Binary files a/Programs/brltty-ktb and b/Programs/brltty-ktb differ diff --git a/Programs/brltty-ktb.c b/Programs/brltty-ktb.c index 4c6358e41aff732fb60414301ca6c6358af348b7..cde0cefd8d5943295f09cfd567a66b5da7496639 100644 --- a/Programs/brltty-ktb.c +++ b/Programs/brltty-ktb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -451,3 +451,9 @@ message (const char *mode, const char *text, MessageOptions options) { void scheduleUpdate (const char *reason) { } + +#include "alert.h" + +void +alert (AlertIdentifier identifier) { +} diff --git a/Programs/brltty-trtxt.c b/Programs/brltty-trtxt.c index 707cb3a9facb728632c15b74ced3667ee8d809c6..401801529743d230c8ed4314d552069e4bf06c49 100644 --- a/Programs/brltty-trtxt.c +++ b/Programs/brltty-trtxt.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -35,6 +35,7 @@ static char *opt_tablesDirectory; static char *opt_inputTable; static char *opt_outputTable; static int opt_sixDots; +static int opt_noBaseCharacters; static const char tableName_autoselect[] = "auto"; static const char tableName_unicode[] = "unicode"; @@ -74,6 +75,13 @@ BEGIN_OPTION_TABLE(programOptions) .setting.flag = &opt_sixDots, .description = strtext("Remove dots seven and eight.") }, + + { .letter = 'b', + .word = "no-base-characters", + .flags = OPT_Config | OPT_Environ, + .setting.flag = &opt_noBaseCharacters, + .description = strtext("Don't fall back to the Unicode base character.") + }, END_OPTION_TABLE static TextTable *inputTable; @@ -214,6 +222,7 @@ getTable (TextTable **table, const char *name) { } if (allocated) free(allocated); + if (opt_noBaseCharacters) setTryBaseCharacter(*table, 0); if (!*table) return 0; } diff --git a/Programs/brltty-ttb.c b/Programs/brltty-ttb.c index 415d0977db67d6d422cd68bdb04a2e35d2fbe7be..d90bf1339a170bed4d8e01df9f445e9f0ff51e5c 100644 --- a/Programs/brltty-ttb.c +++ b/Programs/brltty-ttb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brltty-tune.c b/Programs/brltty-tune.c index 918ba3b8fe2fddbfdfaef199acd3a256a32ccbd0..360ec49b9bcedb6567dcdc88237108e1a0a4b559 100644 --- a/Programs/brltty-tune.c +++ b/Programs/brltty-tune.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -27,6 +27,7 @@ #include "tune_utils.h" #include "tune_build.h" #include "notes.h" +#include "datafile.h" static int opt_fromFiles; static char *opt_outputVolume; @@ -87,34 +88,58 @@ END_OPTION_TABLE static void beginTuneStream (const char *name, void *data) { - TuneBuilder *tune = data; - resetTuneBuilder(tune); - tune->source.name = name; + TuneBuilder *tb = data; + resetTuneBuilder(tb); + setTuneSourceName(tb, name); } static void -playTune (TuneBuilder *tune) { - if (tune->status == TUNE_BUILD_OK) { - if (endTune(tune)) { - tunePlayTones(tune->tones.array); - tuneSynchronize(); - } +playTune (TuneBuilder *tb) { + ToneElement *tune = getTune(tb); + + if (tune) { + tunePlayTones(tune); + tuneSynchronize(); + free(tune); } } static void endTuneStream (int incomplete, void *data) { if (!incomplete) { - TuneBuilder *tune = data; - playTune(tune); + TuneBuilder *tb = data; + playTune(tb); } } -static int -handleTuneLine (char *line, void *data) { - TuneBuilder *tune = data; - tune->source.index += 1; - return parseTuneLine(tune, line); +static +DATA_OPERANDS_PROCESSOR(processTuneOperands) { + DataOperand line; + + if (getTextOperand(file, &line, NULL)) { + DataString text; + + if (parseDataString(file, &text, line.characters, line.length, 0)) { + return parseTuneText(data, text.characters); + } + } + + return 1; +} + +static +DATA_OPERANDS_PROCESSOR(processTuneLine) { + TuneBuilder *tb = data; + incrementTuneSourceIndex(tb); + + BEGIN_DATA_DIRECTIVE_TABLE + DATA_NESTING_DIRECTIVES, + DATA_VARIABLE_DIRECTIVES, + DATA_CONDITION_DIRECTIVES, + {.name=NULL, .processor=processTuneOperands}, + END_DATA_DIRECTIVE_TABLE + + return processDirectiveOperand(file, &directives, "tune file directive", tb); } int @@ -137,54 +162,59 @@ main (int argc, char *argv[]) { #endif /* HAVE_MIDI_SUPPORT */ if (!setTuneDevice()) return PROG_EXIT_SEMANTIC; - TuneBuilder tune; - initializeTuneBuilder(&tune); - ProgramExitStatus exitStatus; - - if (opt_fromFiles) { - const InputFilesProcessingParameters parameters = { - .beginStream = beginTuneStream, - .endStream = endTuneStream, - .handleLine = handleTuneLine, - .data = &tune - }; - - exitStatus = processInputFiles(argv, argc, ¶meters); - } else if (argc) { - exitStatus = PROG_EXIT_SUCCESS; - tune.source.name = ""; - - do { - tune.source.index += 1; - if (!parseTuneLine(&tune, *argv)) break; - argv += 1; - } while (argc -= 1); - - playTune(&tune); - } else { - logMessage(LOG_ERR, "missing tune"); - exitStatus = PROG_EXIT_SYNTAX; - } - - if (exitStatus == PROG_EXIT_SUCCESS) { - switch (tune.status) { - case TUNE_BUILD_OK: - exitStatus = PROG_EXIT_SUCCESS; - break; - - case TUNE_BUILD_SYNTAX: - exitStatus = PROG_EXIT_SYNTAX; - break; + ProgramExitStatus exitStatus = PROG_EXIT_FATAL; + TuneBuilder *tb = newTuneBuilder(); + + if (tb) { + if (opt_fromFiles) { + const InputFilesProcessingParameters parameters = { + .beginStream = beginTuneStream, + .endStream = endTuneStream, + + .dataFileParameters = { + .processOperands = processTuneLine, + .data = tb + } + }; + + exitStatus = processInputFiles(argv, argc, ¶meters); + } else if (argc) { + exitStatus = PROG_EXIT_SUCCESS; + setTuneSourceName(tb, ""); + + do { + incrementTuneSourceIndex(tb); + if (!parseTuneString(tb, *argv)) break; + argv += 1; + } while (argc -= 1); + + playTune(tb); + } else { + logMessage(LOG_ERR, "missing tune"); + exitStatus = PROG_EXIT_SYNTAX; + } - case TUNE_BUILD_FATAL: - exitStatus = PROG_EXIT_FATAL; - break; + if (exitStatus == PROG_EXIT_SUCCESS) { + switch (getTuneStatus(tb)) { + case TUNE_STATUS_OK: + exitStatus = PROG_EXIT_SUCCESS; + break; + + case TUNE_STATUS_SYNTAX: + exitStatus = PROG_EXIT_SYNTAX; + break; + + case TUNE_STATUS_FATAL: + exitStatus = PROG_EXIT_FATAL; + break; + } + } else if (exitStatus == PROG_EXIT_FORCE) { + exitStatus = PROG_EXIT_SUCCESS; } - } else if (exitStatus == PROG_EXIT_FORCE) { - exitStatus = PROG_EXIT_SUCCESS; + + destroyTuneBuilder(tb); } - resetTuneBuilder(&tune); return exitStatus; } diff --git a/Programs/brltty.c b/Programs/brltty.c index 7ac692c403c4010de7edc8469ca69ec4a9093b4f..2ac8585084af135102fd0e0d64b0ceacc63f7fac 100644 --- a/Programs/brltty.c +++ b/Programs/brltty.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brltty.java b/Programs/brltty.java index 39344d4f1565d82922bdd715cc6d9166975b3066..e191d906de1efd98e81ecd5bef4886bd728b970e 100644 --- a/Programs/brltty.java +++ b/Programs/brltty.java @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brltty_jni.c b/Programs/brltty_jni.c index 1dd604bd9c7a612d06abc27deb62eb23569a4807..88e1c4f146a5284fdc1a4cfee2cb41e80e7d65c5 100644 --- a/Programs/brltty_jni.c +++ b/Programs/brltty_jni.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset.c b/Programs/charset.c index 0ee616a9e152de6b95de861fe6ce0acdfde1f6d6..716c32e49cdad04a140b5b65e35e2adee54d16f8 100644 --- a/Programs/charset.c +++ b/Programs/charset.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset_grub.c b/Programs/charset_grub.c index 4a9769b0c3f10274d1774e531736bee9efdbf3a3..4bfa93972e31553d126ce2341b04b2354d5c76fb 100644 --- a/Programs/charset_grub.c +++ b/Programs/charset_grub.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset_iconv.c b/Programs/charset_iconv.c index 342189bdab49c4b71e43c5c41c8a9fd28e41cacf..d877e5795102afbe48d3c33fb3b5db6b866282a2 100644 --- a/Programs/charset_iconv.c +++ b/Programs/charset_iconv.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset_internal.h b/Programs/charset_internal.h index 63082d4d8f44dbeff7e07bc3e27aba9355e30e2f..3e17d09e789d73e4db91e9e75c5f3cf2aea2d0de 100644 --- a/Programs/charset_internal.h +++ b/Programs/charset_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset_msdos.c b/Programs/charset_msdos.c index a41ee2ed94c87df5d7992e19ad0e8e60e1d417c4..75c9aaa4c0c7fc715ca5edeedabd19825dcfd7df 100644 --- a/Programs/charset_msdos.c +++ b/Programs/charset_msdos.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset_none.c b/Programs/charset_none.c index 7903f914613cd515965e654561ba5da411ba2663..99b916e7a36be1b089cf75ac2d0ff8efa789aa2e 100644 --- a/Programs/charset_none.c +++ b/Programs/charset_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/charset_windows.c b/Programs/charset_windows.c index 6111bcd6dabe588aa2f8f35b8b60f233d2bd1464..92f761707d545a9ade405527b821a4b156124b87 100644 --- a/Programs/charset_windows.c +++ b/Programs/charset_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd.c b/Programs/cmd.c index ab81e9fa5f233a0037c4ca5fd8594c15a237c41a..c38a40fddbe98198f9d38dc24b2c2162c21d65b7 100644 --- a/Programs/cmd.c +++ b/Programs/cmd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_brlapi.c b/Programs/cmd_brlapi.c index 0856e0c6e5b293796a7c61eac0dfce0e6d284562..ff1005453e26b231c9e7e3915ef27749ef489505 100644 --- a/Programs/cmd_brlapi.c +++ b/Programs/cmd_brlapi.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_brlapi.h b/Programs/cmd_brlapi.h index e3025fc8fc67d464216303a6d5fa061843a07b91..5b696e1d5229a3a26c75abb2492e94547393e1f4 100644 --- a/Programs/cmd_brlapi.h +++ b/Programs/cmd_brlapi.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_clipboard.c b/Programs/cmd_clipboard.c index c316f30b7dd3b0cbc36b876092ff076bc0d762a7..7bc45eba6919c5e8edabc20457740c4ccba16019 100644 --- a/Programs/cmd_clipboard.c +++ b/Programs/cmd_clipboard.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_clipboard.h b/Programs/cmd_clipboard.h index c629edcfbc950fb7d3d7bc8429bc7305fe49afe4..e7e5e934a8300de813cf07605f0937abada8559e 100644 --- a/Programs/cmd_clipboard.h +++ b/Programs/cmd_clipboard.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_custom.c b/Programs/cmd_custom.c index 03bd5af97360c466ed3d0cc4b3b3a69a9f9cebd3..7a775a8a423355ce82bc35a32f711bc59ca6de18 100644 --- a/Programs/cmd_custom.c +++ b/Programs/cmd_custom.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_custom.h b/Programs/cmd_custom.h index e433f5613652bb64b518d807937bd5a566a9fc9d..784538796894afd0d093e9c4dbb39c9def7eddb4 100644 --- a/Programs/cmd_custom.h +++ b/Programs/cmd_custom.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_input.c b/Programs/cmd_input.c index 160d5a30f7ed4f880d93ae3fc0594479d6b38f9a..c403ba5fe4de3c26f07736e424f42a2a08121de8 100644 --- a/Programs/cmd_input.c +++ b/Programs/cmd_input.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_input.h b/Programs/cmd_input.h index 39ca3ce07e31be9ac65fd5f222f52f114cbb1745..f4398d20ea4f92287707455f093e248b85a584bd 100644 --- a/Programs/cmd_input.h +++ b/Programs/cmd_input.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_keycodes.c b/Programs/cmd_keycodes.c index a58cb829e4404eba0bd85b54406311f322ba8ae1..913265b0bc2e8e63349fd46a56458b6e6235e1c5 100644 --- a/Programs/cmd_keycodes.c +++ b/Programs/cmd_keycodes.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_keycodes.h b/Programs/cmd_keycodes.h index cbad3bfa26586f6bce203f2c7813d77a67bed984..005ee0339c9e88ff1dca6906bab2c79e52610778 100644 --- a/Programs/cmd_keycodes.h +++ b/Programs/cmd_keycodes.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_learn.c b/Programs/cmd_learn.c index cfb5d9ede3f8bbd917d8aa147a7d40f2eb4b91bb..fa616f7509d6e80a7cbbc2ab814a41caab17cf4f 100644 --- a/Programs/cmd_learn.c +++ b/Programs/cmd_learn.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_learn.h b/Programs/cmd_learn.h index 21553f75c56e3187bd356fe688268d6089b04562..bd4dc2ef20eaa0ee2976a49222ba4c71df735a82 100644 --- a/Programs/cmd_learn.h +++ b/Programs/cmd_learn.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_miscellaneous.c b/Programs/cmd_miscellaneous.c index c475a02d9a6fbdebcd89f6cccc25a507adab4121..4e9a7d36acf6509b72bc845e7227398d8ccc28e0 100644 --- a/Programs/cmd_miscellaneous.c +++ b/Programs/cmd_miscellaneous.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_miscellaneous.h b/Programs/cmd_miscellaneous.h index 6f929f54e878939ad8831247b0025ec72162122e..95c6fb59fe5823932495256643e575f16a3e4e49 100644 --- a/Programs/cmd_miscellaneous.h +++ b/Programs/cmd_miscellaneous.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_navigation.c b/Programs/cmd_navigation.c index 63e77dcff4cbd60577f752c51567510ee2845f62..82f733e5e687dec2b6faab18e9f23359a7b6f769 100644 --- a/Programs/cmd_navigation.c +++ b/Programs/cmd_navigation.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -62,7 +62,7 @@ toDifferentLine ( ) { if (canMoveWindow()) { ScreenCharacter characters1[width]; - int skipped = 0; + unsigned int skipped = 0; if ((isSameCharacter == isSameText) && ses->displayMode) isSameCharacter = isSameAttributes; readScreen(from, ses->winy, width, 1, characters1); @@ -73,19 +73,12 @@ toDifferentLine ( if (!isSameRow(characters1, characters2, width, isSameCharacter) || (showScreenCursor() && (scr.posy == ses->winy) && - (scr.posx >= from) && (scr.posx < (from + width)))) + (scr.posx >= from) && (scr.posx < (from + width)))) { return 1; - - /* lines are identical */ - if (skipped == 0) { - alert(ALERT_SKIP_FIRST); - } else if (skipped <= 4) { - alert(ALERT_SKIP); - } else if (skipped % 4 == 0) { - alert(ALERT_SKIP_MORE); } - skipped += 1; + /* lines are identical */ + alertLineSkipped(&skipped); } while (canMoveWindow()); } @@ -772,6 +765,7 @@ handleNavigationCommands (int command, void *data) { } } + cancelDelayedCursorTrackingAlarm(); return 1; } diff --git a/Programs/cmd_navigation.h b/Programs/cmd_navigation.h index 977409d99716ee47925271693b03775dda127f79..0cce5903cb5a45b63a4be24a27f91f35414b274d 100644 --- a/Programs/cmd_navigation.h +++ b/Programs/cmd_navigation.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_preferences.c b/Programs/cmd_preferences.c index 98a29ada11c4b07c3083e542f10b73ad873373c2..3fa6b873c6ccc1d265798037dc08aac2fcd30183 100644 --- a/Programs/cmd_preferences.c +++ b/Programs/cmd_preferences.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_preferences.h b/Programs/cmd_preferences.h index 301a3e2e7f02bebb944934a3719e968aeb37cb69..8a93e5b974369adc5096be88f8476fb1069331e1 100644 --- a/Programs/cmd_preferences.h +++ b/Programs/cmd_preferences.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_queue.c b/Programs/cmd_queue.c index b4678cd81c3acc9ec2afa66ec92b94653ee472d1..91eccd8b019217e60c9c7b38f98f416065989736 100644 --- a/Programs/cmd_queue.c +++ b/Programs/cmd_queue.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_queue.h b/Programs/cmd_queue.h index 5a868611e9eb27ef7beca5b50dbba56103a6271d..7b21ab380ecc78cd3f7b857e9bb9fda3a0f917e1 100644 --- a/Programs/cmd_queue.h +++ b/Programs/cmd_queue.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_speech.c b/Programs/cmd_speech.c index 794fa13e147b409558e642f1527d8a1cc8e75c56..84581f8c0760f4d85b74643c2411fe7974c5cfb7 100644 --- a/Programs/cmd_speech.c +++ b/Programs/cmd_speech.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -373,23 +373,14 @@ handleSpeechCommands (int command, void *data) { if (prefs.skipIdenticalLines) { ScreenCharacter original[scr.cols]; ScreenCharacter current[scr.cols]; - int count = 0; + unsigned int count = 0; readScreen(0, ses->spky, scr.cols, 1, original); do { readScreen(0, ses->spky+=increment, scr.cols, 1, current); if (!isSameRow(original, current, scr.cols, isSameText)) break; - - if (!count) { - alert(ALERT_SKIP_FIRST); - } else if (count < 4) { - alert(ALERT_SKIP); - } else if (!(count % 4)) { - alert(ALERT_SKIP_MORE); - } - - count += 1; + alertLineSkipped(&count); } while (ses->spky != limit); } else { ses->spky += increment; diff --git a/Programs/cmd_speech.h b/Programs/cmd_speech.h index d06affa407b706bd3b3d33ba1947bb001edfd2cd..f8e3c896f16f82351a73732318e4aa82328b2895 100644 --- a/Programs/cmd_speech.h +++ b/Programs/cmd_speech.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_toggle.c b/Programs/cmd_toggle.c index d0851460faee43ff328dfef2b3594cbd761c9133..64c07a9d41ccb50d05105a319bcadcdb957a6d88 100644 --- a/Programs/cmd_toggle.c +++ b/Programs/cmd_toggle.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -163,7 +163,7 @@ handleToggleCommands (int command, void *data) { break; case BRL_CMD_AUTOREPEAT: - toggleFeatureSetting(&prefs.autorepeat, command); + toggleFeatureSetting(&prefs.autorepeatEnabled, command); break; case BRL_CMD_BRLKBD: diff --git a/Programs/cmd_toggle.h b/Programs/cmd_toggle.h index 6c45e11b6887a27566328abeb68b431d947dbf58..30d51664cf221f47af849f9f7a98e18c84863d84 100644 --- a/Programs/cmd_toggle.h +++ b/Programs/cmd_toggle.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_touch.c b/Programs/cmd_touch.c index 530b8d6f5b70ba3d534906d3c03e884d9662d61a..363bf5e12de8a963ff396ed8838644725147cf6a 100644 --- a/Programs/cmd_touch.c +++ b/Programs/cmd_touch.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_touch.h b/Programs/cmd_touch.h index e25662112585793e6fe072c035f7c085c7cc073d..7397cb38dba2bdf9cf669dfcbb8772665405b902 100644 --- a/Programs/cmd_touch.h +++ b/Programs/cmd_touch.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/cmd_utils.c b/Programs/cmd_utils.c index c422261807fd8a2f37e32d78b8530ea401c7b31e..09d4fa296a7c06ee55ac0c2b78387434d51bbde1 100644 --- a/Programs/cmd_utils.c +++ b/Programs/cmd_utils.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -21,11 +21,27 @@ #include #include "strfmt.h" +#include "alert.h" #include "brl_cmds.h" #include "unicode.h" #include "scr.h" #include "core.h" +void +alertLineSkipped (unsigned int *count) { + const unsigned int interval = 4; + + if (!*count) { + alert(ALERT_SKIP_FIRST); + } else if (*count <= interval) { + alert(ALERT_SKIP_ONE); + } else if (!(*count % interval)) { + alert(ALERT_SKIP_SEVERAL); + } + + *count += 1; +} + int isTextOffset (int *arg, int end, int relaxed) { int value = *arg; diff --git a/Programs/cmd_utils.h b/Programs/cmd_utils.h index e1f321ac65bde355d716436ae54e2ee7477175fe..3f5ed90eb91b2188d80ae10766aceac0d986a4af 100644 --- a/Programs/cmd_utils.h +++ b/Programs/cmd_utils.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -25,6 +25,8 @@ extern "C" { #endif /* __cplusplus */ +extern void alertLineSkipped (unsigned int *count); + extern int isTextOffset (int *arg, int end, int relaxed); extern int getCharacterCoordinates (int arg, int *column, int *row, int end, int relaxed); diff --git a/Programs/cmds.awk b/Programs/cmds.awk index 680116c1dbb51bc7bb4206079207e3ab7d67b131..5feaf16bc5c352b53b469a5d375b6c8f13a8de98 100644 --- a/Programs/cmds.awk +++ b/Programs/cmds.awk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/config.c b/Programs/config.c index f08b4ec2b7300c173d2d6070545fbc4b3127b2cf..4a59cd70d408d5815203f67c2a6569a597f2c0a7 100644 --- a/Programs/config.c +++ b/Programs/config.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,10 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* - * config.c - Everything configuration related. - */ - #include "prologue.h" #include @@ -46,6 +42,7 @@ #include "scr_special.h" #include "status.h" #include "blink.h" +#include "variables.h" #include "datafile.h" #include "ttb.h" #include "atb.h" @@ -623,7 +620,7 @@ logProgramBanner (void) { static void logProperty (const char *value, const char *variable, const char *label) { if (*value) { - if (variable) setGlobalDataVariable(variable, value); + if (variable) setGlobalVariable(variable, value); } else { value = gettext("none"); } @@ -1102,11 +1099,17 @@ reconfigureBrailleWindow (void) { static void applyBraillePreferences (void) { reconfigureBrailleWindow(); + setBrailleFirmness(&brl, prefs.brailleFirmness); setTouchSensitivity(&brl, prefs.touchSensitivity); - setBrailleAutorepeat(&brl, prefs.autorepeat, + + setBrailleAutorepeat(&brl, prefs.autorepeatEnabled, PREFERENCES_TIME(prefs.longPressTime), PREFERENCES_TIME(prefs.autorepeatInterval)); + + if (brl.keyTable) { + setKeyAutoreleaseTime(brl.keyTable, prefs.autoreleaseTime); + } } #ifdef ENABLE_SPEECH_SUPPORT diff --git a/Programs/core.c b/Programs/core.c index 8e3759afc61fea0d20adf4556e44b8ba08e32055..02c809cf97e2ad646df28e6faabb43f6cbfc7a29 100644 --- a/Programs/core.c +++ b/Programs/core.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -53,6 +53,7 @@ #include "async_wait.h" #include "async_event.h" #include "async_signal.h" +#include "async_alarm.h" #include "alert.h" #include "ctb.h" #include "routing.h" @@ -253,6 +254,7 @@ setSessionEntry (void) { DIFFERENT; if (state != SAME) { + cancelDelayedCursorTrackingAlarm(); ses = getSessionEntry(scr.number); if (state == FIRST) { @@ -281,6 +283,7 @@ updateSessionAttributes (void) { int maximum = MAX(scr.cols-1, 0); int *table[] = {&ses->winx, &ses->motx, NULL}; int **value = table; + while (*value) { if (**value > maximum) **value = maximum; value += 1; @@ -656,10 +659,77 @@ shiftBrailleWindowRight (unsigned int amount) { return moveWindowRight(amount); } +static int +isWithinBrailleWindow (int x, int y) { + return (x >= ses->winx) + && (x < (int)(ses->winx + textCount)) + && (y >= ses->winy) + && (y < (int)(ses->winy + brl.textRows)) + ; +} + +static AsyncHandle delayedCursorTrackingAlarm; + +ASYNC_ALARM_CALLBACK(handleDelayedCursorTrackingAlarm) { + asyncDiscardHandle(delayedCursorTrackingAlarm); + delayedCursorTrackingAlarm = NULL; + + ses->trkx = ses->dctx; + ses->trky = ses->dcty; + + ses->dctx = -1; + ses->dcty = -1; + + scheduleUpdate("delayed cursor tracking"); +} + +void +cancelDelayedCursorTrackingAlarm (void) { + if (delayedCursorTrackingAlarm) { + asyncCancelRequest(delayedCursorTrackingAlarm); + delayedCursorTrackingAlarm = NULL; + } +} + int trackScreenCursor (int place) { if (!SCR_CURSOR_OK()) return 0; + if (place) { + cancelDelayedCursorTrackingAlarm(); + } else if (delayedCursorTrackingAlarm) { + /* A cursor tracking motion has been delayed. If the cursor returned + * to its initial location in the mean time then we discard and ignore + * the previous motion. Otherwise we wait for the timer to expire. + */ + if ((ses->dctx == scr.posx) && (ses->dcty == scr.posy)) { + cancelDelayedCursorTrackingAlarm(); + } + + return 1; + } else if ((prefs.cursorTrackingDelay > 0) && (ses->dctx != -1) && + !isWithinBrailleWindow(ses->trkx, ses->trky)) { + /* The cursor may move spuriously while a program updates information + * on a status bar. If cursor tracking is on and the cursor was + * outside the braille window before it moved, we delay the tracking + * motion for a while so as not to obnoxiously move the braille window + * in case the cursor will eventually return to its initial location + * within a short time. + */ + ses->dctx = ses->trkx; + ses->dcty = ses->trky; + + int delay = 250 << (prefs.cursorTrackingDelay - 1); + asyncSetAlarmIn(&delayedCursorTrackingAlarm, delay, + handleDelayedCursorTrackingAlarm, NULL); + + return 1; + } + + /* anything but -1 */ + ses->dctx = 0; + ses->dcty = 0; + #ifdef ENABLE_CONTRACTED_BRAILLE if (isContracted) { ses->winy = scr.posy; @@ -685,11 +755,8 @@ trackScreenCursor (int place) { } #endif /* ENABLE_CONTRACTED_BRAILLE */ - if (place) { - if ((scr.posx < ses->winx) || (scr.posx >= (int)(ses->winx + textCount)) || - (scr.posy < ses->winy) || (scr.posy >= (int)(ses->winy + brl.textRows))) { - placeBrailleWindowHorizontally(scr.posx); - } + if (place && !isWithinBrailleWindow(scr.posx, scr.posy)) { + placeBrailleWindowHorizontally(scr.posx); } if (prefs.slidingBrailleWindow) { @@ -1164,6 +1231,8 @@ brlttyConstruct (int argc, char *argv[]) { interruptEvent = NULL; interruptPending = 0; + delayedCursorTrackingAlarm = NULL; + beginCommandQueue(); beginUpdates(); suspendUpdates(); @@ -1180,8 +1249,8 @@ brlttyConstruct (int argc, char *argv[]) { if (!trackScreenCursor(1)) ses->winx = ses->winy = 0; ses->motx = ses->winx; ses->moty = ses->winy; ses->spkx = ses->winx; ses->spky = ses->winy; - resumeUpdates(1); + resumeUpdates(1); return PROG_EXIT_SUCCESS; } diff --git a/Programs/core.h b/Programs/core.h index 9060412cddf25014383af3b400afd32953d33f9c..72191418b071f963e8bbdf44b93c8adf71ed6d14 100644 --- a/Programs/core.h +++ b/Programs/core.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -39,9 +39,8 @@ extern "C" { #endif /* __cplusplus */ extern ScreenDescription scr; -#define SCR_COORDINATE_OK(coordinate,limit) (((coordinate) >= 0) && ((coordinate) < (limit))) -#define SCR_COLUMN_OK(column) SCR_COORDINATE_OK((column), scr.cols) -#define SCR_ROW_OK(row) SCR_COORDINATE_OK((row), scr.rows) +#define SCR_COLUMN_OK(column) IS_WITHIN_BOUNDS((column), scr.cols) +#define SCR_ROW_OK(row) IS_WITHIN_BOUNDS((row), scr.rows) #define SCR_COORDINATES_OK(column,row) (SCR_COLUMN_OK((column)) && SCR_ROW_OK((row))) #define SCR_CURSOR_OK() SCR_COORDINATES_OK(scr.posx, scr.posy) #define SCR_COLUMN_NUMBER(column) (SCR_COLUMN_OK((column))? (column)+1: 0) @@ -103,6 +102,7 @@ extern void slideWindowVertically (int y); extern int showScreenCursor (void); extern int trackScreenCursor (int place); +extern void cancelDelayedCursorTrackingAlarm (void); typedef struct { TimeValue value; diff --git a/Programs/ctb_compile.c b/Programs/ctb_compile.c index ddcc6adf03e4487c9886e194f3ed5e9b0abd897f..c8531c66b86579fe47b50c74beb654d7ebe31a84 100644 --- a/Programs/ctb_compile.c +++ b/Programs/ctb_compile.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -520,7 +520,7 @@ static DATA_OPERANDS_PROCESSOR(processContractionTableDirective) { } } -static DATA_OPERANDS_PROCESSOR(processContractionTableLine) { +static DATA_OPERANDS_PROCESSOR(processContractionTableOperands) { BEGIN_DATA_DIRECTIVE_TABLE DATA_NESTING_DIRECTIVES, {.name=NULL, .processor=processContractionTableDirective}, @@ -633,7 +633,12 @@ compileContractionTable (const char *fileName) { if ((ctd.area = newDataArea())) { if (allocateDataItem(ctd.area, NULL, sizeof(ContractionTableHeader), __alignof__(ContractionTableHeader))) { if (allocateCharacterClasses(&ctd)) { - if (processDataFile(fileName, processContractionTableLine, &ctd)) { + const DataFileParameters parameters = { + .processOperands = processContractionTableOperands, + .data = &ctd + }; + + if (processDataFile(fileName, ¶meters)) { if (saveCharacterTable(&ctd)) { if ((table = malloc(sizeof(*table)))) { initializeCommonFields(table); diff --git a/Programs/ctb_internal.h b/Programs/ctb_internal.h index 77efe3552d7b62d7300420eeb505f20cdbb95d1c..60b09ca259bb9f7dbd7c8cdb3231e830fd0aac8e 100644 --- a/Programs/ctb_internal.h +++ b/Programs/ctb_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ctb_translate.c b/Programs/ctb_translate.c index e6bae7278026a2ab5f40c95a1950abe5ba9acc7e..ebeb53fccae14b4fc29399ecd73737b43b0280be 100644 --- a/Programs/ctb_translate.c +++ b/Programs/ctb_translate.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dataarea.c b/Programs/dataarea.c index e21b8950809de3578301992172853b9bc55a0fc0..a8fc26b8db2f6ba12f32f34ec3609a5e1bf284c3 100644 --- a/Programs/dataarea.c +++ b/Programs/dataarea.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/datafile.c b/Programs/datafile.c index 05696fe6f7ba7b74f72856fa95c4942eac36a830..64b3de2702f608676bac652e5dba3e6aac491f1f 100644 --- a/Programs/datafile.c +++ b/Programs/datafile.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -29,13 +29,15 @@ #include "file.h" #include "queue.h" #include "datafile.h" +#include "variables.h" #include "charset.h" #include "unicode.h" #include "brl_dots.h" struct DataFileStruct { - const char *name; - DataFile *includer; + const char *const name; + const DataFileParameters *const parameters; + DataFile *const includer; int line; struct { @@ -43,11 +45,8 @@ struct DataFileStruct { ino_t file; } identity; - DataOperandsProcessor *processLine; - void *data; - Queue *conditions; - Queue *variables; + VariableNestingLevel *variables; const wchar_t *start; const wchar_t *end; @@ -185,236 +184,38 @@ isNumber (int *number, const wchar_t *characters, int length) { return 0; } -typedef struct { - struct { - wchar_t *characters; - int length; - } name; - - struct { - wchar_t *characters; - int length; - } value; -} DataVariable; - -static Queue *currentDataVariables = NULL; - -static void -deallocateDataVariable (void *item, void *data UNUSED) { - DataVariable *variable = item; - - if (variable->name.characters) free(variable->name.characters); - if (variable->value.characters) free(variable->value.characters); - free(variable); -} - -static Queue * -newDataVariables (void) { - Queue *newVariables = newQueue(deallocateDataVariable, NULL); - - if (newVariables) { - setQueueData(newVariables, currentDataVariables); - currentDataVariables = newVariables; - } - - return newVariables; -} - -static int -testDataVariableName (const void *item, void *data) { - const DataVariable *variable = item; - DataOperand *name = data; - - if (variable->name.length == name->length) { - if (wmemcmp(variable->name.characters, name->characters, name->length) == 0) { - return 1; - } - } - - return 0; -} - -static DataVariable * -getDataVariable (Queue *variables, const DataOperand *name, int create) { - DataVariable *variable; - - { - DataOperand data = *name; - - if ((variable = findItem(variables, testDataVariableName, &data))) return variable; - } - - if (create) { - if ((variable = malloc(sizeof(*variable)))) { - wchar_t *nameCharacters; - - memset(variable, 0, sizeof(*variable)); - - if ((nameCharacters = malloc(ARRAY_SIZE(nameCharacters, name->length)))) { - variable->name.characters = wmemcpy(nameCharacters, name->characters, name->length); - variable->name.length = name->length; - - variable->value.characters = NULL; - variable->value.length = 0; - - if (enqueueItem(variables, variable)) return variable; - - free(nameCharacters); - } else { - logMallocError(); - } - - free(variable); - } else { - logMallocError(); - } - } - - return NULL; -} - -static const DataVariable * -getReadableDataVariable (DataFile *file, const DataOperand *name) { - Queue *variables = currentDataVariables; +static VariableNestingLevel *baseDataVariables = NULL; +static VariableNestingLevel *currentDataVariables = NULL; - do { - DataVariable *variable = getDataVariable(variables, name, 0); - if (variable) return variable; - } while ((variables = getQueueData(variables))); - - return NULL; -} - -static DataVariable * -getWritableDataVariable (DataFile *file, const DataOperand *name) { - return getDataVariable(currentDataVariables, name, 1); -} - -static int -setDataVariable (DataVariable *variable, const wchar_t *characters, int length) { - wchar_t *value; - - if (!length) { - value = NULL; - } else if (!(value = malloc(ARRAY_SIZE(value, length)))) { - logMallocError(); - return 0; +static VariableNestingLevel * +getBaseDataVariables (void) { + if (baseDataVariables) { + releaseVariableNestingLevel(currentDataVariables); + deleteVariables(baseDataVariables); } else { - wmemcpy(value, characters, length); - } - - if (variable->value.characters) free((void *)variable->value.characters); - variable->value.characters = value; - variable->value.length = length; - return 1; -} - -static Queue * -createGlobalDataVariables (void *data) { - return newDataVariables(); -} - -static Queue * -getGlobalDataVariables (int create) { - static Queue *variables = NULL; - - return getProgramQueue(&variables, "global-data-variables", create, - createGlobalDataVariables, NULL); -} - -static int -setStringDataVariable (Queue *variables, const char *name, const char *value) { - size_t nameLength = getUtf8Length(name); - wchar_t nameBuffer[nameLength + 1]; - - size_t valueLength = getUtf8Length(value); - wchar_t valueBuffer[valueLength + 1]; - - { - const char *utf8 = name; - wchar_t *wc = nameBuffer; - convertUtf8ToWchars(&utf8, &wc, ARRAY_COUNT(nameBuffer)); - } - - { - const char *utf8 = value; - wchar_t *wc = valueBuffer; - convertUtf8ToWchars(&utf8, &wc, ARRAY_COUNT(valueBuffer)); - } - - const DataOperand nameArgument = { - .characters = nameBuffer, - .length = nameLength - }; - DataVariable *variable = getDataVariable(variables, &nameArgument, 1); - - if (variable) { - if (setDataVariable(variable, valueBuffer, valueLength)) { - return 1; - } - } + VariableNestingLevel *globalVariables = getGlobalVariables(1); + if (!globalVariables) return NULL; - return 0; -} - -int -setGlobalDataVariable (const char *name, const char *value) { - Queue *variables = getGlobalDataVariables(1); - if (!variables) return 0; - return setStringDataVariable(variables, name, value); -} - -static void -removeDataVariables (Queue *until) { - if (!until) until = getGlobalDataVariables(0); - - while (1) { - Queue *current = currentDataVariables; - if (current == until) break; - Queue *previous = getQueueData(current); - - if (!previous) { - logMessage(LOG_WARNING, "can't remove global data variables"); - break; - } + VariableNestingLevel *baseVariables = newVariableNestingLevel(globalVariables, "base"); + if (!baseVariables) return NULL; - currentDataVariables = previous; - deallocateQueue(current); + baseDataVariables = claimVariableNestingLevel(baseVariables); } -} - -static Queue * -getBaseDataVariables (void) { - Queue *variables = getGlobalDataVariables(1); - if (!variables) return NULL; - removeDataVariables(variables); - return newDataVariables(); + currentDataVariables = claimVariableNestingLevel(baseDataVariables); + return baseDataVariables; } int -setBaseDataVariables (const DataVariableInitializer *initializers) { - Queue *variables = getBaseDataVariables(); +setBaseDataVariables (const VariableInitializer *initializers) { + VariableNestingLevel *variables = getBaseDataVariables(); if (!variables) return 0; - - if (initializers) { - const DataVariableInitializer *initializer = initializers; - - while (initializer->name) { - if (!setStringDataVariable(variables, initializer->name, initializer->value)) { - return 0; - } - - initializer += 1; - } - } - - return 1; + return setStringVariables(variables, initializers); } int setTableDataVariables (const char *tableExtension, const char *subtableExtension) { - const DataVariableInitializer initializers[] = { + const VariableInitializer initializers[] = { { .name = "tableExtension", .value = tableExtension }, { .name = "subtableExtension", .value = subtableExtension }, { .name = NULL } @@ -423,49 +224,15 @@ setTableDataVariables (const char *tableExtension, const char *subtableExtension return setBaseDataVariables(initializers); } -static void -listDataVariableLine (const char *line) { - logMessage(LOG_NOTICE, "%s", line); -} - static int -listDataVariable (void *item, void *data) { - const DataVariable *variable = item; - - char line[0X100]; - STR_BEGIN(line, sizeof(line)); - - STR_PRINTF("data variable: "); - STR_PRINTF("%.*" PRIws, variable->name.length, variable->name.characters); - STR_PRINTF(" = "); - STR_PRINTF("%.*" PRIws, variable->value.length, variable->value.characters); - - STR_END; - listDataVariableLine(line); - - return 0; -} - -void -listDataVariables (void) { - listDataVariableLine("begin data variable listing"); - - Queue *global = getGlobalDataVariables(1); - Queue *first = currentDataVariables; - Queue *current = first; - - while (current) { - if (current == global) { - listDataVariableLine("global data variables"); - } else if (current != first) { - listDataVariableLine("prevoius data variable level"); - } +pushDataVariableNestingLevel (void) { + VariableNestingLevel *variables = newVariableNestingLevel(currentDataVariables, NULL); + if (!variables) return 0; - processQueue(current, listDataVariable, NULL); - current = getQueueData(current); - } + releaseVariableNestingLevel(currentDataVariables); + currentDataVariables = claimVariableNestingLevel(variables); - listDataVariableLine("end data variable listing"); + return 1; } int @@ -499,26 +266,17 @@ ungetDataCharacters (DataFile *file, unsigned int count) { return 1; } -int -getDataOperand (DataFile *file, DataOperand *operand, const char *description) { - if (!findDataOperand(file, description)) return 0; - - do { - file->end += 1; - } while (file->end[0] && !iswspace(file->end[0])); - - operand->characters = file->start; - operand->length = file->end - file->start; - return 1; +void +getTextRemaining (DataFile *file, DataOperand *text) { + file->end = file->start + wcslen(file->start); + text->characters = file->start; + text->length = file->end - file->start; } int -getDataText (DataFile *file, DataOperand *text, const char *description) { +getTextOperand (DataFile *file, DataOperand *text, const char *description) { if (!findDataOperand(file, description)) return 0; - file->end = file->start + wcslen(file->start); - - text->characters = file->start; - text->length = file->end - file->start; + getTextRemaining(file, text); while (text->length) { unsigned int newLength = text->length - 1; @@ -529,6 +287,19 @@ getDataText (DataFile *file, DataOperand *text, const char *description) { return 1; } +int +getDataOperand (DataFile *file, DataOperand *operand, const char *description) { + if (!findDataOperand(file, description)) return 0; + + do { + file->end += 1; + } while (file->end[0] && !iswspace(file->end[0])); + + operand->characters = file->start; + operand->length = file->end - file->start; + return 1; +} + int parseDataString (DataFile *file, DataString *string, const wchar_t *characters, int length, int noUnicode) { int index = 0; @@ -651,17 +422,12 @@ parseDataString (DataFile *file, DataString *string, const wchar_t *characters, if (end) { int count = end - first; - DataOperand name = { - .characters = first, - .length = count - }; - const DataVariable *variable = getReadableDataVariable(file, &name); - index += count; + const Variable *variable = findReadableVariable(currentDataVariables, first, count); + if (variable) { - substitution.characters = variable->value.characters; - substitution.length = variable->value.length; + getVariableValue(variable, &substitution.characters, &substitution.length); ok = 1; } } else { @@ -1038,7 +804,7 @@ pushDataCondition ( .length = name->length }; - condition->isIncluding = testCondition(file, &identifier, file->data); + condition->isIncluding = testCondition(file, &identifier, file->parameters->data); if (negateCondition) condition->isIncluding = !condition->isIncluding; } @@ -1182,12 +948,20 @@ processDirectiveOperand (DataFile *file, DataDirectives *directives, const char } static int -processDataOperands (DataFile *file, const wchar_t *line) { +processDataOperands (DataFile *file) { + return file->parameters->processOperands(file, file->parameters->data); +} + +static int +processDataCharacters (DataFile *file, const wchar_t *line) { file->end = file->start = line; - if (!findDataOperand(file, NULL)) return 1; /*blank line */ - if (file->start[0] == WC_C('#')) return 1; - return file->processLine(file, file->data); + if (!(file->parameters->options & DFO_NO_COMMENTS)) { + if (!findDataOperand(file, NULL)) return 1; + if (file->start[0] == WC_C('#')) return 1; + } + + return processDataOperands(file); } static int @@ -1195,8 +969,7 @@ processConditionSubdirective (DataFile *file, Element *element) { int identifier = getElementIdentifier(element); if (findDataOperand(file, NULL)) { - int result = processDataOperands(file, file->start); - + int result = processDataOperands(file); removeDataCondition(file, element, identifier); return result; } @@ -1223,7 +996,7 @@ processConditionOperands ( } static DATA_CONDITION_TESTER(testVariableDefined) { - return !!getReadableDataVariable(file, identifier); + return !!findReadableVariable(currentDataVariables, identifier->characters, identifier->length); } static int @@ -1240,23 +1013,21 @@ DATA_OPERANDS_PROCESSOR(processIfNotVarOperands) { } DATA_OPERANDS_PROCESSOR(processBeginVariablesOperands) { - return !!newDataVariables(); + return pushDataVariableNestingLevel(); } DATA_OPERANDS_PROCESSOR(processEndVariablesOperands) { if (currentDataVariables == file->variables) { reportDataError(file, "no nested variables"); } else { - Queue *variables = currentDataVariables; - currentDataVariables = getQueueData(variables); - deallocateQueue(variables); + currentDataVariables = removeVariableNestingLevel(currentDataVariables); } return 1; } DATA_OPERANDS_PROCESSOR(processListVariablesOperands) { - listDataVariables(); + listVariables(currentDataVariables); return 1; } @@ -1272,16 +1043,16 @@ processVariableAssignmentOperands (DataFile *file, int ifNotSet, void *data) { } if (ifNotSet) { - const DataVariable *variable = getReadableDataVariable(file, &name); + const Variable *variable = findReadableVariable(currentDataVariables, name.characters, name.length); if (variable) return 1; } { - DataVariable *variable = getWritableDataVariable(file, &name); + Variable *variable = findWritableVariable(currentDataVariables, name.characters, name.length); if (variable) { - if (setDataVariable(variable, value.characters, value.length)) return 1; + if (setVariable(variable, value.characters, value.length)) return 1; } } } @@ -1442,7 +1213,7 @@ includeDataFile (DataFile *file, const wchar_t *name, int length) { (int)suffixLength, suffixAddress); if ((stream = openIncludedDataFile(file, path, "r", 0))) { - if (processDataStream(file, stream, path, file->processLine, file->data)) ok = 1; + if (processDataStream(file, stream, path, file->parameters)) ok = 1; fclose(stream); } } @@ -1482,27 +1253,23 @@ processDataLine (char *line, void *dataAddress) { return 1; } - return processDataOperands(file, characters); + return processDataCharacters(file, characters); } int processDataStream ( DataFile *includer, FILE *stream, const char *name, - DataOperandsProcessor *processLine, void *data + const DataFileParameters *parameters ) { logMessage(LOG_DEBUG, "including data file: %s", name); - - Queue *oldVariables = currentDataVariables; int ok = 0; DataFile file = { .name = name, + .parameters = parameters, .includer = includer, .line = 0, - - .processLine = processLine, - .data = data }; { @@ -1514,7 +1281,11 @@ processDataStream ( } } - if ((file.variables = newDataVariables())) { + VariableNestingLevel *oldVariables = currentDataVariables; + + if ((file.variables = newVariableNestingLevel(oldVariables, name))) { + currentDataVariables = claimVariableNestingLevel(file.variables); + if ((file.conditions = newQueue(deallocateDataCondition, NULL))) { if (processLines(stream, processDataLine, &file)) ok = 1; @@ -1524,19 +1295,21 @@ processDataStream ( deallocateQueue(file.conditions); } + + releaseVariableNestingLevel(currentDataVariables); + currentDataVariables = oldVariables; } - removeDataVariables(oldVariables); return ok; } int -processDataFile (const char *name, DataOperandsProcessor *processLine, void *data) { +processDataFile (const char *name, const DataFileParameters *parameters) { int ok = 0; FILE *stream; if ((stream = openDataFile(name, "r", 0))) { - if (processDataStream(NULL, stream, name, processLine, data)) ok = 1; + if (processDataStream(NULL, stream, name, parameters)) ok = 1; fclose(stream); } diff --git a/Programs/defaults.h b/Programs/defaults.h index 85fb7c69958f0ef84ec8445501e1523e97623072..c34b0a0d3627abe820444a635709510e1626ba31 100644 --- a/Programs/defaults.h +++ b/Programs/defaults.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -71,15 +71,17 @@ extern "C" { #define DEFAULT_SLIDING_BRAILLE_WINDOW 0 /* 1 for on, 0 for off */ #define DEFAULT_EAGER_SLIDING_BRAILLE_WINDOW 0 #define DEFAULT_BRAILLE_WINDOW_OVERLAP 0 +#define DEFAULT_CURSOR_TRACKING_DELAY ctd250ms #define DEFAULT_TRACK_SCREEN_POINTER 0 /* 1 for on, 0 for off */ #define DEFAULT_HIGHLIGHT_BRAILLE_WINDOW_LOCATION 0 /* 1 for on, 0 for off */ #define DEFAULT_LONG_PRESS_TIME 50 /* hundredths of a second */ -#define DEFAULT_AUTOREPEAT 1 /* 1 for on, 0 for off */ +#define DEFAULT_AUTOREPEAT_ENABLED 1 /* 1 for on, 0 for off */ #define DEFAULT_AUTOREPEAT_PANNING 0 /* 1 for on, 0 for off */ #define DEFAULT_AUTOREPEAT_INTERVAL 10 /* hundredths of a second */ +#define DEFAULT_AUTORELEASE_TIME at20s #define DEFAULT_TOUCH_NAVIGATION 0 #define DEFAULT_TOUCH_SENSITIVITY BRL_SENSITIVITY_MEDIUM diff --git a/Programs/device.c b/Programs/device.c index a10d985f4ad23c65a09d13d1f70e96853b4417e1..33743621e2cd505bc4c83da19d545853385b9eb5 100644 --- a/Programs/device.c +++ b/Programs/device.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/driver.c b/Programs/driver.c index c2485d3a1f51f40c59c708bb6432c7eac4786415..784a1b9dd25b924ebebf6fc104271bef32550484 100644 --- a/Programs/driver.c +++ b/Programs/driver.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/drivers.c b/Programs/drivers.c index ea4c50b3912456216689eaf761203f6e24445802..98d0aed727a0e9e67b1b94d1e26da0da8386bc2f 100644 --- a/Programs/drivers.c +++ b/Programs/drivers.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dynld_dlfcn.c b/Programs/dynld_dlfcn.c index 2132bcf2b2c124dfba0cdb01ded90cd2acdc0884..83dbe9ec76937bd7331cebe390ebeab970206755 100644 --- a/Programs/dynld_dlfcn.c +++ b/Programs/dynld_dlfcn.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dynld_dyld.c b/Programs/dynld_dyld.c index 78bb8406f121f5b987e86249e2d2f6599abdf929..af285f6df187801976cc8838c1c98c40c673b0e9 100644 --- a/Programs/dynld_dyld.c +++ b/Programs/dynld_dyld.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dynld_grub.c b/Programs/dynld_grub.c index 3efa9da879c538ddd8934b5aeda17cc2d44d177a..456da52d349c625bb0c7e9417d1386851bba2245 100644 --- a/Programs/dynld_grub.c +++ b/Programs/dynld_grub.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dynld_none.c b/Programs/dynld_none.c index dec402cacb030e6e4b24203d8854bb6f3d3d5566..8fc6f6ba265a32ed9f9d42a534fe873d08c3ef46 100644 --- a/Programs/dynld_none.c +++ b/Programs/dynld_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dynld_shl.c b/Programs/dynld_shl.c index 01162de5c4ae12be43a4ce29722fbd5a474158c3..e3afdf9766ff74e5a467514c6072240ec48e5c49 100644 --- a/Programs/dynld_shl.c +++ b/Programs/dynld_shl.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/dynld_windows.c b/Programs/dynld_windows.c index 0668926bd47bae9b4fb2dc6f229de73eafadc4e9..69e54348b44b44db238146c7029cca06c43208ea 100644 --- a/Programs/dynld_windows.c +++ b/Programs/dynld_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/file.c b/Programs/file.c index 59779ef8461442cdcc3f55a31c02a08ee25baa1e..7d85eb23965e7d72f82a5c649112ab3138e30e3d 100644 --- a/Programs/file.c +++ b/Programs/file.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -325,7 +325,7 @@ createDirectory (const char *path) { #else /* make directory */ if (mkdir(path #ifndef __MINGW32__ - ,S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH + ,(S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) #endif /* __MINGW32__ */ ) != -1) return 1; #endif /* make directory */ diff --git a/Programs/fm_adlib.c b/Programs/fm_adlib.c index ad4740a6d1c08dbe1db33961b6757f1737600387..3f8219a9d0cc924c2403a8393a83c87654f29d17 100644 --- a/Programs/fm_adlib.c +++ b/Programs/fm_adlib.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/fm_none.c b/Programs/fm_none.c index 94c89b0e8ff8da420869ec27168f2c66c60f427a..1d5d332b5791875d29cacfa04d1d385d363463d8 100644 --- a/Programs/fm_none.c +++ b/Programs/fm_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/gio.c b/Programs/gio.c index b47841f8ad310998e001478920427732483745e1..d21a4b47ebce5d676cb2b7aeec38f984d2eeb656 100644 --- a/Programs/gio.c +++ b/Programs/gio.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/gio_bluetooth.c b/Programs/gio_bluetooth.c index 9283fa2d3a8b69320ca23b53c201a54c42878354..fd17df9c998d880412800f2c37497c013814b683 100644 --- a/Programs/gio_bluetooth.c +++ b/Programs/gio_bluetooth.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/gio_internal.h b/Programs/gio_internal.h index fe794f06fa88f4a7830872ba769adad08273fdb9..55e650c52470e578b4b597a46fc955716b2531cb 100644 --- a/Programs/gio_internal.h +++ b/Programs/gio_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/gio_null.c b/Programs/gio_null.c index b2cfd3965104638bab08cdb06213a5e90bf82cc5..88bc29b4898f9b4890ad86c2d9649cefdbc19b83 100644 --- a/Programs/gio_null.c +++ b/Programs/gio_null.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/gio_serial.c b/Programs/gio_serial.c index fc395c868cdbcc4249a397cce912164a1015896e..9009281529f183ddb06c13e20a7dc61499ad3b97 100644 --- a/Programs/gio_serial.c +++ b/Programs/gio_serial.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/gio_usb.c b/Programs/gio_usb.c index c1f3b04f7475b4dd4fea378f6fe49a436d18afd8..8fe95642479ad6bb73fce9fbae31e996e59f031f 100644 --- a/Programs/gio_usb.c +++ b/Programs/gio_usb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hidkeys.c b/Programs/hidkeys.c index d207fe77714c985123ba67c647ce1397dd651401..72a75db8b9c9854fc03c56aeb0414ac27f4ce277 100644 --- a/Programs/hidkeys.c +++ b/Programs/hidkeys.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hidkeys.h b/Programs/hidkeys.h index 04d484762918d6f2912a6d1a72b7f4271369a0b7..26106ed25ca9424aaf06e76e5158463c4ab79d51 100644 --- a/Programs/hidkeys.h +++ b/Programs/hidkeys.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd.c b/Programs/hostcmd.c index bac4fa60b605459dc4f93c61f082a32a021fd8f2..da5978c099287632d6317b131472c379c815ed2c 100644 --- a/Programs/hostcmd.c +++ b/Programs/hostcmd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_internal.h b/Programs/hostcmd_internal.h index 0705ad4328c063383fe63b69bb940c377913741c..02f9733c1dedb3034eccd871e6a2b1b1e6b2ae08 100644 --- a/Programs/hostcmd_internal.h +++ b/Programs/hostcmd_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_none.c b/Programs/hostcmd_none.c index 13bcf5a4ba2ea22d322b7e943be43d2929604c5d..113e2229a835e7b00db83061395f3b8e74037205 100644 --- a/Programs/hostcmd_none.c +++ b/Programs/hostcmd_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_none.h b/Programs/hostcmd_none.h index 296029fcd3f439006c7a20cf7825a222dea5199a..e6879c457fdb70a47be05e12a9c9c4d26122c970 100644 --- a/Programs/hostcmd_none.h +++ b/Programs/hostcmd_none.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_unix.c b/Programs/hostcmd_unix.c index 450f1ee97afdd070400bf2de94d942f43778ed83..0a09ccd89f3ffadb5c8bc7757a4494c6303cdfb8 100644 --- a/Programs/hostcmd_unix.c +++ b/Programs/hostcmd_unix.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_unix.h b/Programs/hostcmd_unix.h index 1779f4a1bd9c8b1c2468a29008658e2c17645f9c..981e5b2d3a4ae927048b70f3dd5b81b1527273b0 100644 --- a/Programs/hostcmd_unix.h +++ b/Programs/hostcmd_unix.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_windows.c b/Programs/hostcmd_windows.c index 6eefce8658b02d4610e080beb97e63645e17ba89..2c1ac8498eb7740dee61e31cd6a5fabd2ff743cc 100644 --- a/Programs/hostcmd_windows.c +++ b/Programs/hostcmd_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/hostcmd_windows.h b/Programs/hostcmd_windows.h index 1d9559356df528a0999eb066034d49150b8b2bfe..86054952a7851ccdf3a57d2265c809112710213b 100644 --- a/Programs/hostcmd_windows.h +++ b/Programs/hostcmd_windows.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/io_misc.c b/Programs/io_misc.c index bb6bb6ec2697b380347a140bf165fac0031f3172..8320315de3b556d1b5464b6c3f2c9ad407d7e4b0 100644 --- a/Programs/io_misc.c +++ b/Programs/io_misc.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd.c b/Programs/kbd.c index 1500d5416d63ec1861a1bb5c4e99b23867a14778..453ec86777df48f5d56bd2b74e66fa073c947a31 100644 --- a/Programs/kbd.c +++ b/Programs/kbd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd.h b/Programs/kbd.h index ba07cea527a9fb72451fd88f9d5c9ca704d8677c..47f265a0d95af4cc77e4575d9631cc79b11ad165 100644 --- a/Programs/kbd.h +++ b/Programs/kbd.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd_android.c b/Programs/kbd_android.c index 7333e8adb03bdc92a072b9d6eb243b7034fbe8fd..ef27ca765a0a52078cf686c3bd3f99d0351c0304 100644 --- a/Programs/kbd_android.c +++ b/Programs/kbd_android.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd_android.h b/Programs/kbd_android.h index 916c72c974a985b425f50036ad10babc76d706c6..d080d279f045d5de80c7a99f184f1b99c6c2311c 100644 --- a/Programs/kbd_android.h +++ b/Programs/kbd_android.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd_internal.h b/Programs/kbd_internal.h index 68f38a4056b772898ecc6482503b74b905d7f2ee..62c686fe03783c74729054b542d92cb442d0c993 100644 --- a/Programs/kbd_internal.h +++ b/Programs/kbd_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd_keycodes.c b/Programs/kbd_keycodes.c index 4fb5ac1a53d33ba0838c208aa863ec5120d48128..528a962092859799e171d69b8e66f1d9874f2a69 100644 --- a/Programs/kbd_keycodes.c +++ b/Programs/kbd_keycodes.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd_linux.c b/Programs/kbd_linux.c index 1e611d21c7a30ee4874e02071b5bc08eb91c4356..4c94be073b1a1c7bceb1ef729ebd31aaee3f20bf 100644 --- a/Programs/kbd_linux.c +++ b/Programs/kbd_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/kbd_none.c b/Programs/kbd_none.c index be0dfcd4d39f1f50c08858de497c87f1add8a9ee..f42b312631a2a054ca58d91a35c8b42a2330c20e 100644 --- a/Programs/kbd_none.c +++ b/Programs/kbd_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_audit.c b/Programs/ktb_audit.c index b9d4f2e7f9e8952c641c1047e4f61bc6c09a979f..1cdff1b1f99fc1b49fb898c3e72d9b640061b8bd 100644 --- a/Programs/ktb_audit.c +++ b/Programs/ktb_audit.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_cmds.c b/Programs/ktb_cmds.c index 41edd1557be6ce7a229fee2730bcbe9ab5accf75..82d95d80f66865c911aec4f5204d2e54af252d0a 100644 --- a/Programs/ktb_cmds.c +++ b/Programs/ktb_cmds.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_compile.c b/Programs/ktb_compile.c index 053abeb1f7ef01031475eb442218d2ecbd8b62aa..20ba4efdb108b3694eb65b9d50785d72f2468a1c 100644 --- a/Programs/ktb_compile.c +++ b/Programs/ktb_compile.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -923,7 +923,7 @@ static DATA_OPERANDS_PROCESSOR(processContextOperands) { ctx->isDefined = 1; - if (getDataText(file, &title, NULL)) { + if (getTextOperand(file, &title, NULL)) { if (ctx->title) { if ((title.length != wcslen(ctx->title)) || (wmemcmp(title.characters, ctx->title, title.length) != 0)) { @@ -1088,7 +1088,7 @@ static DATA_OPERANDS_PROCESSOR(processNoteOperands) { KeyTableData *ktd = data; DataOperand operand; - if (getDataText(file, &operand, "note text")) { + if (getTextOperand(file, &operand, "note text")) { if (!hideBindings(ktd)) { DataString string; @@ -1152,7 +1152,7 @@ static DATA_OPERANDS_PROCESSOR(processTitleOperands) { KeyTableData *ktd = data; DataOperand title; - if (getDataText(file, &title, "title text")) { + if (getTextOperand(file, &title, "title text")) { if (ktd->table->title) { reportDataError(file, "table title specified more than once"); } else if (!(ktd->table->title = malloc(ARRAY_SIZE(ktd->table->title, title.length+1)))) { @@ -1168,7 +1168,7 @@ static DATA_OPERANDS_PROCESSOR(processTitleOperands) { return 1; } -static DATA_OPERANDS_PROCESSOR(processKeyTableLine) { +static DATA_OPERANDS_PROCESSOR(processKeyTableOperands) { BEGIN_DATA_DIRECTIVE_TABLE DATA_VARIABLE_DIRECTIVES, DATA_CONDITION_DIRECTIVES, @@ -1189,15 +1189,6 @@ static DATA_OPERANDS_PROCESSOR(processKeyTableLine) { return processDirectiveOperand(file, &directives, "key table directive", data); } -void -releaseAllKeys (KeyTable *table) { - while (table->pressedKeys.count) { - const KeyValue *kv = &table->pressedKeys.table[0]; - - processKeyEvent(table, KTB_CTX_DEFAULT, kv->group, kv->number, 0); - } -} - void resetLongPressData (KeyTable *table) { table->release.command = BRL_CMD_NOOP; @@ -1603,6 +1594,9 @@ compileKeyTable (const char *name, KEY_NAME_TABLES_REFERENCE keys) { ktd.table->longPress.alarm = NULL; + ktd.table->autorelease.alarm = NULL; + ktd.table->autorelease.time = 0; + ktd.table->options.logLabel = NULL; ktd.table->options.logKeyEventsFlag = NULL; ktd.table->options.keyboardEnabledFlag = NULL; @@ -1610,7 +1604,12 @@ compileKeyTable (const char *name, KEY_NAME_TABLES_REFERENCE keys) { if (defineInitialKeyContexts(&ktd)) { if (allocateKeyNameTable(&ktd, keys)) { if (allocateCommandTable(&ktd)) { - if (processDataFile(name, processKeyTableLine, &ktd)) { + const DataFileParameters parameters = { + .processOperands = processKeyTableOperands, + .data = &ktd + }; + + if (processDataFile(name, ¶meters)) { if (finishKeyTable(&ktd)) { table = ktd.table; ktd.table = NULL; @@ -1634,6 +1633,7 @@ compileKeyTable (const char *name, KEY_NAME_TABLES_REFERENCE keys) { void destroyKeyTable (KeyTable *table) { resetLongPressData(table); + setKeyAutoreleaseTime(table, 0); while (table->notes.count) free(table->notes.table[--table->notes.count]); diff --git a/Programs/ktb_inspect.h b/Programs/ktb_inspect.h index 8d2aae3d432e00ef7c3656cedcfcb87a4286020e..718d8912cb3f9f025d23c8753480a1e59dc14309 100644 --- a/Programs/ktb_inspect.h +++ b/Programs/ktb_inspect.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_internal.h b/Programs/ktb_internal.h index 23fa4187304c92d123f7c54abeeee6ce815267d4..ed8157fc515996ac78152e06c0509ecd9f0147b8 100644 --- a/Programs/ktb_internal.h +++ b/Programs/ktb_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -161,6 +161,11 @@ struct KeyTableStruct { KeyValue keyValue; } longPress; + struct { + AsyncHandle alarm; + unsigned char time; + } autorelease; + struct { const char *logLabel; const unsigned char *logKeyEventsFlag; diff --git a/Programs/ktb_keyboard.c b/Programs/ktb_keyboard.c index 88665e8c2613307e6f11a6bdbd33b8c927f47b69..8361204de85b9758f271e84c9a9d09a051d60e6b 100644 --- a/Programs/ktb_keyboard.c +++ b/Programs/ktb_keyboard.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_keyboard.h b/Programs/ktb_keyboard.h index e47e28d990d7fd90dbf011849add1d14fe2b9d0b..2b53163160265522f8d1994f50b424ec3fc24764 100644 --- a/Programs/ktb_keyboard.h +++ b/Programs/ktb_keyboard.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_list.c b/Programs/ktb_list.c index b2499acd7113ae5d2d49794031bc40e94858642d..413529f8accf90ae2773851df57dd2253f203b9f 100644 --- a/Programs/ktb_list.c +++ b/Programs/ktb_list.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_list.h b/Programs/ktb_list.h index b5f7fcabcd46b4340a7913d8aac443a098107782..6d80237e222442c84090bea1e796c84c6229ea04 100644 --- a/Programs/ktb_list.h +++ b/Programs/ktb_list.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ktb_translate.c b/Programs/ktb_translate.c index bf5aab48ec7300cf89eee8a2bcd4f6f035a2f74d..e617a843c84f9f9282c353b9179cccbb18f2c674 100644 --- a/Programs/ktb_translate.c +++ b/Programs/ktb_translate.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -35,6 +35,58 @@ #define BRL_CMD_ALERT(alert) BRL_CMD_ARG(ALERT, ALERT_##alert) +ASYNC_ALARM_CALLBACK(handleKeyAutoreleaseAlarm) { + KeyTable *table = parameters->data; + + asyncDiscardHandle(table->autorelease.alarm); + table->autorelease.alarm = NULL; + + for (unsigned int index=0; indexpressedKeys.count; index+=1) { + const KeyValue *kv = &table->pressedKeys.table[index]; + + char key[0X40]; + STR_BEGIN(key, sizeof(key)); + + STR_FORMAT(formatKeyName, table, kv); + STR_PRINTF(" (Grp:%u Num:%u)", kv->group, kv->number); + + STR_END; + logMessage(LOG_WARNING, "autoreleasing key: %s", key); + } + + resetKeyTable(table); + alert(ALERT_KEYS_AUTORELEASED); +} + +static void +cancelAutoreleaseAlarm (KeyTable *table) { + if (table->autorelease.alarm) { + asyncCancelRequest(table->autorelease.alarm); + table->autorelease.alarm = NULL; + } +} + +static void +setAutoreleaseAlarm (KeyTable *table) { + if (!prefs.autoreleaseTime || !table->pressedKeys.count) { + cancelAutoreleaseAlarm(table); + } else { + int time = 5000 << (prefs.autoreleaseTime - 1); + + if (table->autorelease.alarm) { + asyncResetAlarmIn(table->autorelease.alarm, time); + } else { + asyncSetAlarmIn(&table->autorelease.alarm, time, handleKeyAutoreleaseAlarm, table); + } + } +} + +void +setKeyAutoreleaseTime (KeyTable *table, unsigned char seconds) { + table->autorelease.time = seconds; + setAutoreleaseAlarm(table); +} + static int sortModifierKeys (const void *element1, const void *element2) { const KeyValue *modifier1 = element1; @@ -338,7 +390,7 @@ setLongPressAlarm (KeyTable *table, unsigned char when) { static int isRepeatableCommand (int command) { - if (prefs.autorepeat) { + if (prefs.autorepeatEnabled) { switch (command & BRL_MSK_BLK) { case BRL_CMD_BLK(PASSCHAR): case BRL_CMD_BLK(PASSDOTS): @@ -524,12 +576,22 @@ processKeyEvent ( resetLongPressData(table); } + + setAutoreleaseAlarm(table); } logKeyEvent(table, (press? "press": "release"), context, &keyValue, command); return state; } +void +releaseAllKeys (KeyTable *table) { + while (table->pressedKeys.count) { + const KeyValue *kv = &table->pressedKeys.table[0]; + processKeyEvent(table, KTB_CTX_DEFAULT, kv->group, kv->number, 0); + } +} + void setKeyTableLogLabel (KeyTable *table, const char *label) { table->options.logLabel = label; diff --git a/Programs/learn.c b/Programs/learn.c index 4c98ada15ee1bfdfa286493d562c0fe588a42a21..e60b6610d95f028dfc08aa768290ef556ee6c1b9 100644 --- a/Programs/learn.c +++ b/Programs/learn.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -51,7 +51,9 @@ ASYNC_CONDITION_TESTER(testEndLearnWait) { static int handleLearnModeCommands (int command, void *data) { LearnModeData *lmd = data; + logMessage(LOG_DEBUG, "learn: command=%06X", command); + lmd->state = LMS_CONTINUE; switch (command & BRL_MSK_CMD) { case BRL_CMD_LEARN: @@ -59,11 +61,16 @@ handleLearnModeCommands (int command, void *data) { return 1; case BRL_CMD_NOOP: - lmd->state = LMS_CONTINUE; return 1; default: - lmd->state = LMS_CONTINUE; + switch (command & BRL_MSK_BLK) { + case BRL_CMD_BLK(TOUCH_AT): + return 1; + + default: + break; + } break; } diff --git a/Programs/learn.h b/Programs/learn.h index bbca17162ef798301d6360f33a5a80359aea019e..b1d9cf200a193a10a009164e03fba23c391e34f2 100644 --- a/Programs/learn.h +++ b/Programs/learn.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/leds.c b/Programs/leds.c index 387d8049214b51ac967a2f8b0d54536021963ff4..3d1dbd8a0c03eb09b532f972f8c314897c8b19de 100644 --- a/Programs/leds.c +++ b/Programs/leds.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/leds_linux.c b/Programs/leds_linux.c index 0b42775e136183b683e2ff4e5e19006ee5b912bb..f77625aceb9cef34a239753159e3315237edf53c 100644 --- a/Programs/leds_linux.c +++ b/Programs/leds_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/leds_none.c b/Programs/leds_none.c index 80f0455180820e514114935f32d88795c0b6f6c1..37fc65e8447721d22db70a5881ee4e97dd8097e4 100644 --- a/Programs/leds_none.c +++ b/Programs/leds_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/lock.c b/Programs/lock.c index f96743bcf1e5bd7184b55e6b1040593fba057568..5820f27cc62ac9425c649a7728efa280a3f62af7 100644 --- a/Programs/lock.c +++ b/Programs/lock.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/log.c b/Programs/log.c index 69e6b4fd56770004a82b5bf5e3b514d92080c654..04fd1c1dbcc778e938585eaf4a3fd71692f45bdd 100644 --- a/Programs/log.c +++ b/Programs/log.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/menu.c b/Programs/menu.c index aed94a4d6f27f3942d580785c80841d194d7bcb2..31f61ece0651cc8603d00129203d821289e28b3c 100644 --- a/Programs/menu.c +++ b/Programs/menu.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/menu_prefs.c b/Programs/menu_prefs.c index ecd2ab2be9e6e4d094ea0ca7ebfded7ab4ade29d..cc057bf9ad86fbd2cdd17f1e06e83c35c303529f 100644 --- a/Programs/menu_prefs.c +++ b/Programs/menu_prefs.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -32,6 +32,7 @@ #include "ttb.h" #include "atb.h" #include "ctb.h" +#include "ktb.h" #include "tune.h" #include "bell.h" #include "leds.h" @@ -91,8 +92,14 @@ changedBrailleWindowOverlap (const MenuItem *item UNUSED, unsigned char setting) } static int -testAutorepeat (void) { - return prefs.autorepeat; +changedAutoreleaseTime (const MenuItem *item UNUSED, unsigned char setting) { + if (brl.keyTable) setKeyAutoreleaseTime(brl.keyTable, setting); + return 1; +} + +static int +testAutorepeatEnabled (void) { + return prefs.autorepeatEnabled; } static int @@ -102,7 +109,7 @@ setAutorepeat (BrailleDisplay *brl, int on, int delay, int interval) { } static int -changedAutorepeat (const MenuItem *item UNUSED, unsigned char setting) { +changedAutorepeatEnabled (const MenuItem *item UNUSED, unsigned char setting) { return setAutorepeat(&brl, setting, PREFERENCES_TIME(prefs.longPressTime), PREFERENCES_TIME(prefs.autorepeatInterval)); @@ -110,14 +117,14 @@ changedAutorepeat (const MenuItem *item UNUSED, unsigned char setting) { static int changedAutorepeatDelay (const MenuItem *item UNUSED, unsigned char setting) { - return setAutorepeat(&brl, prefs.autorepeat, + return setAutorepeat(&brl, prefs.autorepeatEnabled, setting, PREFERENCES_TIME(prefs.autorepeatInterval)); } static int changedAutorepeatInterval (const MenuItem *item UNUSED, unsigned char setting) { - return setAutorepeat(&brl, prefs.autorepeat, + return setAutorepeat(&brl, prefs.autorepeatEnabled, PREFERENCES_TIME(prefs.longPressTime), setting); } @@ -705,6 +712,19 @@ makePreferencesMenu (void) { CHANGED(BrailleWindowOverlap); } + { + static const MenuString strings[] = { + {.label=strtext("None")}, + {.label=strtext("250 milliseconds")}, + {.label=strtext("500 milliseconds")}, + {.label=strtext("1 second")}, + {.label=strtext("2 seconds")} + }; + + NAME(strtext("Cursor Tracking Delay")); + ITEM(newEnumeratedMenuItem(navigationSubmenu, &prefs.cursorTrackingDelay, &itemName, strings)); + } + #ifdef HAVE_LIBGPM { NAME(strtext("Track Screen Pointer")); @@ -721,6 +741,20 @@ makePreferencesMenu (void) { { SUBMENU(inputSubmenu, rootMenu, strtext("Input Options")); + { + static const MenuString strings[] = { + {.label=strtext("Off")}, + {.label=strtext("5 seconds")}, + {.label=strtext("10 seconds")}, + {.label=strtext("20 seconds")}, + {.label=strtext("40 seconds")} + }; + + NAME(strtext("Autorelease Time")); + ITEM(newEnumeratedMenuItem(inputSubmenu, &prefs.autoreleaseTime, &itemName, strings)); + CHANGED(AutoreleaseTime); + } + { NAME(strtext("Long Press Time")); ITEM(newTimeMenuItem(inputSubmenu, &prefs.longPressTime, &itemName)); @@ -729,20 +763,20 @@ makePreferencesMenu (void) { { NAME(strtext("Autorepeat")); - ITEM(newBooleanMenuItem(inputSubmenu, &prefs.autorepeat, &itemName)); - CHANGED(Autorepeat); + ITEM(newBooleanMenuItem(inputSubmenu, &prefs.autorepeatEnabled, &itemName)); + CHANGED(AutorepeatEnabled); } { NAME(strtext("Autorepeat Panning")); ITEM(newBooleanMenuItem(inputSubmenu, &prefs.autorepeatPanning, &itemName)); - TEST(Autorepeat); + TEST(AutorepeatEnabled); } { NAME(strtext("Autorepeat Interval")); ITEM(newTimeMenuItem(inputSubmenu, &prefs.autorepeatInterval, &itemName)); - TEST(Autorepeat); + TEST(AutorepeatEnabled); CHANGED(AutorepeatInterval); } diff --git a/Programs/menu_prefs.h b/Programs/menu_prefs.h index 3a49ca12e1d07bf2ed265bf3742c5959b4abaed8..f8c9d8510394e7d9cf33c6cb83bfb19116ef960d 100644 --- a/Programs/menu_prefs.h +++ b/Programs/menu_prefs.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/message.c b/Programs/message.c index 3101cf2eb2914dd67ffcc27c9bf64b0ee5ef8ba7..b3499fc9aaec4614292a021043048f2012c71a12 100644 --- a/Programs/message.c +++ b/Programs/message.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -106,7 +106,9 @@ ASYNC_TASK_CALLBACK(presentMessage) { wchar_t characters[length + 1]; const wchar_t *character = characters; - api.unlink(); + int wasLinked = api.isLinked(); + if (wasLinked) api.unlink(); + convertTextToWchars(characters, mgp->text, ARRAY_COUNT(characters)); suspendUpdates(); pushCommandEnvironment("message", NULL, NULL); @@ -165,7 +167,7 @@ ASYNC_TASK_CALLBACK(presentMessage) { popCommandEnvironment(); resumeUpdates(1); - api.link(); + if (wasLinked) api.link(); } if (mgp->deallocate) free(mgp); diff --git a/Programs/midi.c b/Programs/midi.c index 96f31d7043050915a5515ba4caabe1a0a3d4877c..e5936acb10cac116852c7288827a898dc1a9ef12 100644 --- a/Programs/midi.c +++ b/Programs/midi.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/midi_alsa.c b/Programs/midi_alsa.c index 7b5e8ab534badb5579f4b6d6c1868364fd6d7e94..fe080365a3d1fe6863f47617acbcecd427d4cb81 100644 --- a/Programs/midi_alsa.c +++ b/Programs/midi_alsa.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/midi_darwin.c b/Programs/midi_darwin.c index 8056c034bff850dfcb8a6fa300843f164ac0c5bc..717dbb11daaa9a800da530cf142567c25a1991f8 100644 --- a/Programs/midi_darwin.c +++ b/Programs/midi_darwin.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/midi_none.c b/Programs/midi_none.c index d6d7dc88f6b37f92f0f652729e3f709087455abd..586424828a4a447619cff27fdc6d3ad262298561 100644 --- a/Programs/midi_none.c +++ b/Programs/midi_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/midi_oss.c b/Programs/midi_oss.c index d528c7c562bd16c008790891675cfe550ae25a28..6151344fca8952d4ad70ce2f5de786c1f2f510f2 100644 --- a/Programs/midi_oss.c +++ b/Programs/midi_oss.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/midi_windows.c b/Programs/midi_windows.c index d6c088b8da52db147151b14b0af5d42f6c3b2bc1..49de7bcba5310059617f508916eef7060d743a05 100644 --- a/Programs/midi_windows.c +++ b/Programs/midi_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mkdrvtab b/Programs/mkdrvtab index 3fc5083c2f2d0c453f67bb18265dcadb486cb830..0dc6ee6225c919b864434838ce0ffb5a492def09 100755 --- a/Programs/mkdrvtab +++ b/Programs/mkdrvtab @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Programs/mntfs_linux.c b/Programs/mntfs_linux.c index a8cd71dc1b8a38dae2ff51144650dd74bfdd7cc6..1502f9ba9c75d45a68a05b73e90deb942380eccd 100644 --- a/Programs/mntfs_linux.c +++ b/Programs/mntfs_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntfs_none.c b/Programs/mntfs_none.c index 4109243a553dff10607e6637dbc62b8414182b93..92cfffb7f36bc701a058f4812608eb5d6cc988c4 100644 --- a/Programs/mntfs_none.c +++ b/Programs/mntfs_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt.c b/Programs/mntpt.c index f9f541e5cdc5d6b51c523c286b1c341b3c6b7c4f..5ac2f331556a10626ffe0d93b3f7594a74d8de2a 100644 --- a/Programs/mntpt.c +++ b/Programs/mntpt.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_internal.h b/Programs/mntpt_internal.h index 3be54f300112d76bd3ec02f433f8f400599f190c..75a612cf78c34c91c5596768f0fc4df8a23c8b59 100644 --- a/Programs/mntpt_internal.h +++ b/Programs/mntpt_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_mntent.c b/Programs/mntpt_mntent.c index c765943ef849331b6bd9e21ea3cb071c2b1e1633..7d45d4461201b907e9ea4b28ddb789fe0a2adab4 100644 --- a/Programs/mntpt_mntent.c +++ b/Programs/mntpt_mntent.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_mntent.h b/Programs/mntpt_mntent.h index 30ba8e4c1b634acac345da78f1466940f4731499..7de371ba49352bda3837d4acbe29899ddfeef3ae 100644 --- a/Programs/mntpt_mntent.h +++ b/Programs/mntpt_mntent.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_mnttab.c b/Programs/mntpt_mnttab.c index 4e86891acb9b3922ca8d040cdaa724e0e0c8de92..8d0e7bdaf8252565ef06af37d6589eaddb9347f1 100644 --- a/Programs/mntpt_mnttab.c +++ b/Programs/mntpt_mnttab.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_mnttab.h b/Programs/mntpt_mnttab.h index 4d6678ec0cfea275881568cce8c69720ba3375ae..b154bf7721a39b6f7c2f937a1ffd84c2d7c62c61 100644 --- a/Programs/mntpt_mnttab.h +++ b/Programs/mntpt_mnttab.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_none.c b/Programs/mntpt_none.c index c0e981fd3e07711380148e5a77d3c92a336134c2..03b5bdaf7a149cfc8974b8d457727aeec2f76ec4 100644 --- a/Programs/mntpt_none.c +++ b/Programs/mntpt_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/mntpt_none.h b/Programs/mntpt_none.h index 7d55d1e4e2c88361c49ae1751d6d77ae3108328b..76ae6efac1a2de2086e73ceb820a5b4ced4a175f 100644 --- a/Programs/mntpt_none.h +++ b/Programs/mntpt_none.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/notes.c b/Programs/notes.c index 7099e15fd3f33928f3526351466ec046e0c9d716..40b55fdf33817a851cbf226d0a9d8a0713581cc3 100644 --- a/Programs/notes.c +++ b/Programs/notes.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/notes_beep.c b/Programs/notes_beep.c index 41d236afa01e14e231fe690bde9b76a87f8ae3c4..d6db0249be0ac87cc6783222cc0274075657ad49 100644 --- a/Programs/notes_beep.c +++ b/Programs/notes_beep.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/notes_fm.c b/Programs/notes_fm.c index f847c963a227089afb4161c490bfe316b28c80a1..1707621f9dd53754661fa2ba06aa087d4cab948a 100644 --- a/Programs/notes_fm.c +++ b/Programs/notes_fm.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/notes_midi.c b/Programs/notes_midi.c index ede2f2ec638f0ae3810c4919f693c8e553a62395..7c27be609fe5d6b92663e914b454eed00f752ea2 100644 --- a/Programs/notes_midi.c +++ b/Programs/notes_midi.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/notes_pcm.c b/Programs/notes_pcm.c index 455f822aae7e898e9080c72c468417117fc828cc..7dddf00c5f0ac3adfaa1a23dcbcaf9e9e3d67c6e 100644 --- a/Programs/notes_pcm.c +++ b/Programs/notes_pcm.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/options.c b/Programs/options.c index 1feb6e0129ac69a3a1bcb6130b70b4d28bb101e3..9fd5091ab47d54d9d24726624ac128e9fe7a3fce 100644 --- a/Programs/options.c +++ b/Programs/options.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -118,9 +118,8 @@ printHelp ( char line[lineWidth+1]; unsigned int wordWidth = 0; unsigned int argumentWidth = 0; - unsigned int optionIndex; - for (optionIndex=0; optionIndexoptionCount; ++optionIndex) { + for (unsigned int optionIndex=0; optionIndexoptionCount; ++optionIndex) { const OptionEntry *option = &info->optionTable[optionIndex]; if (option->word) { @@ -145,7 +144,7 @@ printHelp ( } fprintf(outputStream, "\n"); - for (optionIndex=0; optionIndexoptionCount; ++optionIndex) { + for (unsigned int optionIndex=0; optionIndexoptionCount; ++optionIndex) { const OptionEntry *option = &info->optionTable[optionIndex]; unsigned int lineLength = 0; @@ -282,7 +281,6 @@ processCommandLine ( const char *argumentsSummary ) { int lastOptInd = -1; - unsigned int index; const char resetPrefix = '+'; const char *reset = NULL; @@ -303,7 +301,8 @@ processCommandLine ( { struct option *opt = longOptions; - for (index=0; indexoptionCount; ++index) { + + for (unsigned int index=0; indexoptionCount; ++index) { const OptionEntry *entry = &info->optionTable[index]; if (entry->word) { @@ -345,13 +344,15 @@ processCommandLine ( } #endif /* HAVE_GETOPT_LONG */ - for (index=0; index<0X100; index+=1) optionEntries[index] = NULL; + for (unsigned int index=0; index<0X100; index+=1) { + optionEntries[index] = NULL; + } { char *opt = shortOptions; *opt++ = '+'; - for (index=0; indexoptionCount; ++index) { + for (unsigned int index=0; indexoptionCount; ++index) { const OptionEntry *entry = &info->optionTable[index]; optionEntries[entry->letter] = entry; @@ -651,9 +652,7 @@ processEnvironmentVariables ( OptionProcessingInformation *info, const char *prefix ) { - unsigned int optionIndex; - - for (optionIndex=0; optionIndexoptionCount; optionIndex+=1) { + for (unsigned int optionIndex=0; optionIndexoptionCount; optionIndex+=1) { const OptionEntry *option = &info->optionTable[optionIndex]; if (!processEnvironmentVariable(info, option, prefix)) return 0; @@ -667,9 +666,7 @@ processInternalSettings ( OptionProcessingInformation *info, int config ) { - unsigned int optionIndex; - - for (optionIndex=0; optionIndexoptionCount; ++optionIndex) { + for (unsigned int optionIndex=0; optionIndexoptionCount; ++optionIndex) { const OptionEntry *option = &info->optionTable[optionIndex]; if (!(option->flags & OPT_Config) == !config) { @@ -852,9 +849,7 @@ freeConfigurationDirectives (ConfigurationFileProcessingData *conf) { static int addConfigurationDirectives (ConfigurationFileProcessingData *conf) { - unsigned int optionIndex; - - for (optionIndex=0; optionIndexinfo->optionCount; optionIndex+=1) { + for (unsigned int optionIndex=0; optionIndexinfo->optionCount; optionIndex+=1) { const OptionEntry *option = &conf->info->optionTable[optionIndex]; if ((option->flags & OPT_Config) && option->word) { @@ -911,13 +906,22 @@ processConfigurationFile ( }; if (addConfigurationDirectives(&conf)) { - unsigned int index; int processed; - for (index=0; indexoptionCount; index+=1) conf.settings[index] = NULL; - processed = processDataStream(NULL, file, path, processConfigurationLine, &conf); + for (unsigned int index=0; indexoptionCount; index+=1) { + conf.settings[index] = NULL; + } + + { + const DataFileParameters dataFileParameters = { + .processOperands = processConfigurationLine, + .data = &conf + }; + + processed = processDataStream(NULL, file, path, &dataFileParameters); + } - for (index=0; indexoptionCount; index+=1) { + for (unsigned int index=0; indexoptionCount; index+=1) { char *setting = conf.settings[index]; if (setting) { @@ -980,10 +984,8 @@ processOptions (const OptionsDescriptor *descriptor, int *argumentCount, char ** onProgramExit("options", exitOptions, (void *)descriptor); - { - unsigned int index; - - for (index=0; index<0X100; index+=1) info.ensuredSettings[index] = 0; + for (unsigned int index=0; index<0X100; index+=1) { + info.ensuredSettings[index] = 0; } beginProgram(*argumentCount, *argumentVector); @@ -1017,14 +1019,20 @@ processInputStream ( FILE *stream, const char *name, const InputFilesProcessingParameters *parameters ) { + int ok = 0; + if (parameters->beginStream) { - parameters->beginStream(name, parameters->data); + parameters->beginStream(name, parameters->dataFileParameters.data); } - int ok = processLines(stream, parameters->handleLine, parameters->data); + if (setBaseDataVariables(NULL)) { + if (processDataStream(NULL, stream, name, ¶meters->dataFileParameters)) { + ok = 1; + } + } if (parameters->endStream) { - parameters->endStream(!ok, parameters->data); + parameters->endStream(!ok, parameters->dataFileParameters.data); } return ok? PROG_EXIT_SUCCESS: PROG_EXIT_FATAL; @@ -1045,7 +1053,7 @@ processInputFile (const char *path, const InputFilesProcessingParameters *parame FILE *stream = fopen(path, "r"); if (!stream) { - logMessage(LOG_ERR, "input file open error: %s: %s", path,strerror(errno)); + logMessage(LOG_ERR, "input file open error: %s: %s", path, strerror(errno)); return PROG_EXIT_FATAL; } diff --git a/Programs/parameters.h b/Programs/parameters.h index 58d1db3b8cde360f24f6bbbd41216db7194de145..b5a2295065450e66734118ec68efefe3bf3e43ba 100644 --- a/Programs/parameters.h +++ b/Programs/parameters.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -73,7 +73,8 @@ extern "C" { #define USB_INPUT_AWAIT_RETRY_INTERVAL_MINIMUM 10 #define USB_INPUT_READ_INITIAL_TIMEOUT_DEFAULT 20 -#define USB_INPUT_INTERRUPT_URB_COUNT 8 +#define USB_INPUT_INTERRUPT_DELAY_MAXIMUM 16 +#define USB_INPUT_INTERRUPT_REQUESTS_MAXIMUM 8 #define BLUETOOTH_DEVICE_NAME_OBTAIN_TIMEOUT 5000 #define BLUETOOTH_CHANNEL_BUSY_RETRY_TIMEOUT 2000 diff --git a/Programs/params_linux.c b/Programs/params_linux.c index 464343f7e2be6546375219e324b610d4c99350f8..6d87de060e607feb7dbafae4d08e95e0d8df4dc5 100644 --- a/Programs/params_linux.c +++ b/Programs/params_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/params_none.c b/Programs/params_none.c index 46f0fbceab0c252d09675a785fee7defc6bc0532..5499f809f3c49ef81ce44e4a4ac7494de03e6927 100644 --- a/Programs/params_none.c +++ b/Programs/params_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/parse.c b/Programs/parse.c index d7e484b388b39fbfe24d9a37583da232af16562a..54fb42b1fcf25dc0bd432f772ddf968470ec2d3d 100644 --- a/Programs/parse.c +++ b/Programs/parse.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm.c b/Programs/pcm.c index 7ca6698c03280ccf9462939e81d358d701aef4ec..4ac1d4e6c6f05d156ab12322e87acc68a54a44dc 100644 --- a/Programs/pcm.c +++ b/Programs/pcm.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_alsa.c b/Programs/pcm_alsa.c index ddd2421c4298943568c2573af74d608cec5d0c7c..bf26f6dba1dbb0454518049f6d0d15fb599599f7 100644 --- a/Programs/pcm_alsa.c +++ b/Programs/pcm_alsa.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_android.c b/Programs/pcm_android.c index 1ede951b8bc763b575f9d376ee4977931516dbf1..65487121380a53b36e827ef016670b71a772aa8f 100644 --- a/Programs/pcm_android.c +++ b/Programs/pcm_android.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_audio.c b/Programs/pcm_audio.c index af47c233e417041209d0493318932fa93ccafc15..ed931125a84607f71f7e79ff66ad6b422c06e9ad 100644 --- a/Programs/pcm_audio.c +++ b/Programs/pcm_audio.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_hpux.c b/Programs/pcm_hpux.c index 8684d5345e5ad51b2ee25aba33df4d323f66f427..3c40b62b654df1311b70da5f00e02c35c51e43cd 100644 --- a/Programs/pcm_hpux.c +++ b/Programs/pcm_hpux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_none.c b/Programs/pcm_none.c index 5d940f89de7ad187431353950f491c01d1032c01..f2692cd26654e3839bca85d3e4653365ead1356e 100644 --- a/Programs/pcm_none.c +++ b/Programs/pcm_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_oss.c b/Programs/pcm_oss.c index 547070804d76772f813c779aaef7f781b6ea440a..4a32b12fd541772ed789705d276dd61b38716972 100644 --- a/Programs/pcm_oss.c +++ b/Programs/pcm_oss.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_qsa.c b/Programs/pcm_qsa.c index 8508856c7bbf4236f84a8cb65f41827c77ba05e6..a4603024ea125c99e9b22b326b3aba6e931e01a8 100644 --- a/Programs/pcm_qsa.c +++ b/Programs/pcm_qsa.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pcm_windows.c b/Programs/pcm_windows.c index 42dfeff34fcbc287c587d482964323e02bdee066..dabad6fd4fd728741f0b7700b5c00470cfa00de4 100644 --- a/Programs/pcm_windows.c +++ b/Programs/pcm_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -102,7 +102,7 @@ openPcmDevice (int errorLevel, const char *device) { |WAVE_FORMAT_1S16)) pcm->format.nSamplesPerSec = 11025; else { - logMessage(errorLevel, "unknown PCM capability %#lx",caps.dwFormats); + logMessage(errorLevel, "unknown PCM capability %#lx", caps.dwFormats); goto out; } if (caps.dwFormats & @@ -122,7 +122,7 @@ openPcmDevice (int errorLevel, const char *device) { |WAVE_FORMAT_4S08)) pcm->format.wBitsPerSample = 8; else { - logMessage(LOG_ERR, "unknown PCM capability %#lx",caps.dwFormats); + logMessage(LOG_ERR, "unknown PCM capability %#lx", caps.dwFormats); goto out; } recomputeWaveOutFormat(&pcm->format); diff --git a/Programs/pgmpath_linux.c b/Programs/pgmpath_linux.c index c94bcf967159bc6be55ff69fa8452e6d39ea8f2a..395ae2dd41920135a60506bb7cc1c2bb330b34cc 100644 --- a/Programs/pgmpath_linux.c +++ b/Programs/pgmpath_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pgmpath_none.c b/Programs/pgmpath_none.c index d1bd434cb5ac0d791a9be2f728bbd0f7bdbc9607..b151599625457046ebed7013df5272cca8500bbe 100644 --- a/Programs/pgmpath_none.c +++ b/Programs/pgmpath_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pgmpath_solaris.c b/Programs/pgmpath_solaris.c index 84df37e5aad92dc9fd8c4d5134c5526a20a0170e..3d1a661b7dba5875fa333b7097db583e024dfb11 100644 --- a/Programs/pgmpath_solaris.c +++ b/Programs/pgmpath_solaris.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pgmpath_windows.c b/Programs/pgmpath_windows.c index 6a0c667bc87063890ee22790ad677b136250f826..a025163063557829978459163957a50c1ec1ee3b 100644 --- a/Programs/pgmpath_windows.c +++ b/Programs/pgmpath_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pid.c b/Programs/pid.c index 4246e96d7914a8640fa705b59d64dc2ac335d4da..9f57e9ccc19f2487ab2c8006891a663dcc7e57f7 100644 --- a/Programs/pid.c +++ b/Programs/pid.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pipe.c b/Programs/pipe.c index 902e7acd409dae30d7c7f31d9f8081ba40ff8b5f..6721c1acfee546da2773cdb971e2830f60cd2ef6 100644 --- a/Programs/pipe.c +++ b/Programs/pipe.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/pipe.h b/Programs/pipe.h index 6647464221a342bddaf092af3d2ca99d39b0aaed..fe06011e524e1b1740371f595d75856b0c9984be 100644 --- a/Programs/pipe.h +++ b/Programs/pipe.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_glibc.c b/Programs/ports_glibc.c index 500958f3b223cd9d24f618af613d702dd151d50d..0ec32a1aa497a7478413ea99f5303c2bd9ec5b23 100644 --- a/Programs/ports_glibc.c +++ b/Programs/ports_glibc.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_grub.c b/Programs/ports_grub.c index 3a38f1c1a682a521e8520f890fa06ab5a21642ca..90a0f16e9c238876148b90870551a6625d2c716f 100644 --- a/Programs/ports_grub.c +++ b/Programs/ports_grub.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_kfreebsd.c b/Programs/ports_kfreebsd.c index 849e4ca039ca0870a43ea74182313112f00df8db..8da45e8b567723c7a9e5a1cf5b395ce23d2342a6 100644 --- a/Programs/ports_kfreebsd.c +++ b/Programs/ports_kfreebsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_msdos.c b/Programs/ports_msdos.c index 47790f95935e45639feef5954e0a334f916f6ea3..206d05d93e840205431a5f829f32287e04a5fc0a 100644 --- a/Programs/ports_msdos.c +++ b/Programs/ports_msdos.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_none.c b/Programs/ports_none.c index 66a81f8a002f5659714a7a2b907a275648fc3afa..ab106270ab5232910d6bb2544ab143c7c3f9bb60 100644 --- a/Programs/ports_none.c +++ b/Programs/ports_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_windows.c b/Programs/ports_windows.c index a7f2fe4ee7d1f25e33391bae335ba03076174341..0c5456a86dc8817d059ae5c9f18368a792c6fef1 100644 --- a/Programs/ports_windows.c +++ b/Programs/ports_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ports_x86.h b/Programs/ports_x86.h index 734f4a919d8b181234e6e4c56819be6481e6bd87..cb179a838040b27870e4a56d08b1bc98be83aad8 100644 --- a/Programs/ports_x86.h +++ b/Programs/ports_x86.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/prefs.c b/Programs/prefs.c index b6287cb2fe3024a834abacde129c7f13c598ca84..a74416a78a7098e6d587033c6fefbb271cf236fa 100644 --- a/Programs/prefs.c +++ b/Programs/prefs.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -205,16 +205,22 @@ getPreferenceSetting ( const char *name, const char *operand, unsigned char *setting, const PreferenceStringTable *names ) { - int value; - - if (isInteger(&value, operand)) { - if ((value >= 0) && (value <= 0XFF)) { - *setting = value; - return 1; + if (names) { + for (unsigned int index=0; indexcount; index+=1) { + if (strcmp(operand, names->table[index]) == 0) { + *setting = index; + return 1; + } } - } else { - for (value=0; valuecount; value+=1) { - if (strcmp(operand, names->table[value]) == 0) { + } + + { + int value; + + if (isInteger(&value, operand)) { + unsigned char maximum = names? (names->count - 1): 0XFF; + + if ((value >= 0) && (value <= maximum)) { *setting = value; return 1; } @@ -377,7 +383,7 @@ loadPreferencesFile (const char *path) { if (prefs.version == 2) { prefs.version += 1; - prefs.autorepeat = DEFAULT_AUTOREPEAT; + prefs.autorepeatEnabled = DEFAULT_AUTOREPEAT_ENABLED; prefs.longPressTime = DEFAULT_LONG_PRESS_TIME; prefs.autorepeatInterval = DEFAULT_AUTOREPEAT_INTERVAL; prefs.screenCursorVisibleTime *= 4; diff --git a/Programs/prefs_internal.h b/Programs/prefs_internal.h index 3daa43702ab35d7388b87406ebc0951da5543f56..855ee2de758193ec4db64e9eee57cd9bd13f1e76 100644 --- a/Programs/prefs_internal.h +++ b/Programs/prefs_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/prefs_table.c b/Programs/prefs_table.c index e8ee1528c81157be501c74d2837b9c6466b1bccf..2375c5c87bd40f8bf70e58b9da381840e5779e06 100644 --- a/Programs/prefs_table.c +++ b/Programs/prefs_table.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -46,6 +46,14 @@ PREFERENCE_STRING_TABLE(skipBlankWindowsMode, "all", "end", "rest" ) +PREFERENCE_STRING_TABLE(cursorTrackingDelay, + "0", "25", "50", "100", "200" +) + +PREFERENCE_STRING_TABLE(autoreleaseTime, + "0", "5", "10", "20", "40" +) + PREFERENCE_STRING_TABLE(cursorStyle, "underline", "block", "dot7", "dot8" ) @@ -276,6 +284,12 @@ const PreferenceEntry preferenceTable[] = { .setting = &prefs.brailleWindowOverlap }, + { .name = "cursor-tracking-delay", + .defaultValue = DEFAULT_CURSOR_TRACKING_DELAY, + .settingNames = &preferenceStringTable_cursorTrackingDelay, + .setting = &prefs.cursorTrackingDelay + }, + { .name = "track-screen-pointer", .defaultValue = DEFAULT_TRACK_SCREEN_POINTER, .settingNames = &preferenceStringTable_boolean, @@ -294,9 +308,9 @@ const PreferenceEntry preferenceTable[] = { }, { .name = "autorepeat", - .defaultValue = DEFAULT_AUTOREPEAT, + .defaultValue = DEFAULT_AUTOREPEAT_ENABLED, .settingNames = &preferenceStringTable_boolean, - .setting = &prefs.autorepeat + .setting = &prefs.autorepeatEnabled }, { .name = "autorepeat-panning", @@ -310,6 +324,12 @@ const PreferenceEntry preferenceTable[] = { .setting = &prefs.autorepeatInterval }, + { .name = "autorelease-time", + .defaultValue = DEFAULT_AUTORELEASE_TIME, + .settingNames = &preferenceStringTable_autoreleaseTime, + .setting = &prefs.autoreleaseTime + }, + { .name = "touch-navigation", .defaultValue = DEFAULT_TOUCH_NAVIGATION, .settingNames = &preferenceStringTable_boolean, diff --git a/Programs/profile.c b/Programs/profile.c index d4540ce6f315c4ee2f2b3b0af2dc19b6ef76d484..49f9d9411fce784894d8fb88abe6e88fc8b7ef2e 100644 --- a/Programs/profile.c +++ b/Programs/profile.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -82,7 +82,7 @@ static DATA_OPERANDS_PROCESSOR(processPropertyOperands) { return ok; } -static DATA_OPERANDS_PROCESSOR(processProfileLine) { +static DATA_OPERANDS_PROCESSOR(processProfileOperands) { BEGIN_DATA_DIRECTIVE_TABLE DATA_NESTING_DIRECTIVES, DATA_VARIABLE_DIRECTIVES, @@ -146,34 +146,38 @@ changeProperties (const ProfileDescriptor *profile, char **values) { int activateProfile (const ProfileDescriptor *profile, const char *directory, const char *name) { int ok = 0; - char *path; - if ((path = makeProfilePath(profile, directory, name))) { - ProfileActivationData pad = { - .profile = profile - }; + if (setBaseDataVariables(NULL)) { + char *path; - if ((pad.values = malloc(ARRAY_SIZE(pad.values, profile->properties.count)))) { - { - unsigned int index; + if ((path = makeProfilePath(profile, directory, name))) { + ProfileActivationData pad = { + .profile = profile + }; - for (index=0; indexproperties.count; index+=1) { + if ((pad.values = malloc(ARRAY_SIZE(pad.values, profile->properties.count)))) { + for (unsigned int index=0; indexproperties.count; index+=1) { pad.values[index] = NULL; } - } - if (processDataFile(path, processProfileLine, &pad)) { - if (changeProperties(profile, pad.values)) { - ok = 1; + const DataFileParameters parameters = { + .processOperands = processProfileOperands, + .data = &pad + }; + + if (processDataFile(path, ¶meters)) { + if (changeProperties(profile, pad.values)) { + ok = 1; + } } + + free(pad.values); + } else { + logMallocError(); } - free(pad.values); - } else { - logMallocError(); + free(path); } - - free(path); } return ok; diff --git a/Programs/profile.h b/Programs/profile.h index d8f210f5fdbb95be5be702a9e00269f8290f9abb..13ab07d1a13b08c68bd82cd27992ce8a542262da 100644 --- a/Programs/profile.h +++ b/Programs/profile.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/profile_types.h b/Programs/profile_types.h index 801f4ae674813219cdae8483a659ec5a417ffaa7..0d2b9c176093816e8ca4f5635d157a81bdb5230b 100644 --- a/Programs/profile_types.h +++ b/Programs/profile_types.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/program.c b/Programs/program.c index b51ecbd8e3459c58b94713e648b972816a16110d..1e9c86f719171b9b1072829859197b54486e4949 100644 --- a/Programs/program.c +++ b/Programs/program.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/queue.c b/Programs/queue.c index f6086fad6a27c614029b9d265d38b24d7eb50323..f234830ecf59e6f7f70c02ab77ce9f90f87bf432 100644 --- a/Programs/queue.c +++ b/Programs/queue.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/reldeps.mk b/Programs/reldeps.mk index c2f5bc4ed147dd9cefef2d2f4a438a0eaea00cea..fcd15d95826fddac8f5f18398dfd9d621a78b0f7 100644 --- a/Programs/reldeps.mk +++ b/Programs/reldeps.mk @@ -28,10 +28,13 @@ alert.$O: $(SRC_TOP)Headers/prologue.h alert.$O: $(BLD_TOP)config.h alert.$O: $(BLD_TOP)forbuild.h alert.$O: $(SRC_TOP)Headers/alert.h +alert.$O: $(SRC_TOP)Headers/pid.h +alert.$O: $(SRC_TOP)Headers/program.h alert.$O: $(SRC_TOP)Headers/prefs.h alert.$O: $(SRC_TOP)Headers/note_types.h alert.$O: $(SRC_TOP)Headers/tune.h alert.$O: $(SRC_TOP)Headers/tune_types.h +alert.$O: $(SRC_TOP)Headers/tune_build.h alert.$O: $(SRC_TOP)Headers/message.h alert.$O: $(SRC_TOP)Headers/brl_dots.h @@ -75,12 +78,12 @@ apitest.$O: $(SRC_DIR)/apitest.c apitest.$O: $(SRC_TOP)Headers/prologue.h apitest.$O: $(BLD_TOP)config.h apitest.$O: $(BLD_TOP)forbuild.h -apitest.$O: $(SRC_TOP)Headers/file.h -apitest.$O: $(SRC_TOP)Headers/get_sockets.h +apitest.$O: $(SRC_TOP)Headers/datafile.h apitest.$O: $(SRC_TOP)Headers/options.h apitest.$O: $(SRC_TOP)Headers/pid.h apitest.$O: $(SRC_TOP)Headers/program.h apitest.$O: $(SRC_TOP)Headers/strfmth.h +apitest.$O: $(SRC_TOP)Headers/variables.h apitest.$O: $(SRC_TOP)Headers/brl_cmds.h apitest.$O: $(SRC_TOP)Headers/brl_dots.h apitest.$O: $(SRC_TOP)Headers/cmd.h @@ -202,6 +205,7 @@ atb_compile.$O: $(BLD_TOP)forbuild.h atb_compile.$O: $(SRC_TOP)Headers/file.h atb_compile.$O: $(SRC_TOP)Headers/get_sockets.h atb_compile.$O: $(SRC_TOP)Headers/datafile.h +atb_compile.$O: $(SRC_TOP)Headers/variables.h atb_compile.$O: $(SRC_TOP)Headers/dataarea.h atb_compile.$O: $(SRC_TOP)Headers/atb.h atb_compile.$O: $(SRC_DIR)/atb_internal.h @@ -683,13 +687,15 @@ brltest.$O: $(BLD_TOP)config.h brltest.$O: $(BLD_TOP)forbuild.h brltest.$O: $(SRC_TOP)Headers/pid.h brltest.$O: $(SRC_TOP)Headers/program.h -brltest.$O: $(SRC_TOP)Headers/file.h -brltest.$O: $(SRC_TOP)Headers/get_sockets.h +brltest.$O: $(SRC_TOP)Headers/datafile.h brltest.$O: $(SRC_TOP)Headers/options.h brltest.$O: $(SRC_TOP)Headers/strfmth.h +brltest.$O: $(SRC_TOP)Headers/variables.h brltest.$O: $(SRC_DIR)/parameters.h brltest.$O: $(SRC_TOP)Headers/log.h brltest.$O: $(SRC_TOP)Headers/parse.h +brltest.$O: $(SRC_TOP)Headers/file.h +brltest.$O: $(SRC_TOP)Headers/get_sockets.h brltest.$O: $(SRC_TOP)Headers/ktb_types.h brltest.$O: $(SRC_DIR)/cmd_queue.h brltest.$O: $(SRC_TOP)Headers/api_types.h @@ -710,6 +716,9 @@ brltest.$O: $(SRC_TOP)Headers/charset.h brltest.$O: $(SRC_TOP)Headers/lock.h brltest.$O: $(SRC_TOP)Headers/async_wait.h brltest.$O: $(SRC_DIR)/learn.h +brltest.$O: $(SRC_TOP)Headers/scr_types.h +brltest.$O: $(SRC_DIR)/scr.h +brltest.$O: $(SRC_TOP)Headers/alert.h # Dependencies for brltty-atb.$O: brltty-atb.$O: $(SRC_DIR)/brltty-atb.c @@ -718,10 +727,10 @@ brltty-atb.$O: $(BLD_TOP)config.h brltty-atb.$O: $(BLD_TOP)forbuild.h brltty-atb.$O: $(SRC_TOP)Headers/pid.h brltty-atb.$O: $(SRC_TOP)Headers/program.h -brltty-atb.$O: $(SRC_TOP)Headers/file.h -brltty-atb.$O: $(SRC_TOP)Headers/get_sockets.h +brltty-atb.$O: $(SRC_TOP)Headers/datafile.h brltty-atb.$O: $(SRC_TOP)Headers/options.h brltty-atb.$O: $(SRC_TOP)Headers/strfmth.h +brltty-atb.$O: $(SRC_TOP)Headers/variables.h brltty-atb.$O: $(SRC_TOP)Headers/log.h brltty-atb.$O: $(SRC_TOP)Headers/atb.h @@ -732,13 +741,14 @@ brltty-ctb.$O: $(BLD_TOP)config.h brltty-ctb.$O: $(BLD_TOP)forbuild.h brltty-ctb.$O: $(SRC_TOP)Headers/pid.h brltty-ctb.$O: $(SRC_TOP)Headers/program.h -brltty-ctb.$O: $(SRC_TOP)Headers/file.h -brltty-ctb.$O: $(SRC_TOP)Headers/get_sockets.h +brltty-ctb.$O: $(SRC_TOP)Headers/datafile.h brltty-ctb.$O: $(SRC_TOP)Headers/options.h brltty-ctb.$O: $(SRC_TOP)Headers/strfmth.h +brltty-ctb.$O: $(SRC_TOP)Headers/variables.h brltty-ctb.$O: $(SRC_TOP)Headers/prefs.h brltty-ctb.$O: $(SRC_TOP)Headers/log.h -brltty-ctb.$O: $(SRC_TOP)Headers/datafile.h +brltty-ctb.$O: $(SRC_TOP)Headers/file.h +brltty-ctb.$O: $(SRC_TOP)Headers/get_sockets.h brltty-ctb.$O: $(SRC_TOP)Headers/parse.h brltty-ctb.$O: $(SRC_TOP)Headers/charset.h brltty-ctb.$O: $(SRC_TOP)Headers/lock.h @@ -755,11 +765,13 @@ brltty-ktb.$O: $(BLD_TOP)config.h brltty-ktb.$O: $(BLD_TOP)forbuild.h brltty-ktb.$O: $(SRC_TOP)Headers/pid.h brltty-ktb.$O: $(SRC_TOP)Headers/program.h -brltty-ktb.$O: $(SRC_TOP)Headers/file.h -brltty-ktb.$O: $(SRC_TOP)Headers/get_sockets.h +brltty-ktb.$O: $(SRC_TOP)Headers/datafile.h brltty-ktb.$O: $(SRC_TOP)Headers/options.h brltty-ktb.$O: $(SRC_TOP)Headers/strfmth.h +brltty-ktb.$O: $(SRC_TOP)Headers/variables.h brltty-ktb.$O: $(SRC_TOP)Headers/log.h +brltty-ktb.$O: $(SRC_TOP)Headers/file.h +brltty-ktb.$O: $(SRC_TOP)Headers/get_sockets.h brltty-ktb.$O: $(SRC_TOP)Headers/parse.h brltty-ktb.$O: $(SRC_TOP)Headers/dynld.h brltty-ktb.$O: $(SRC_TOP)Headers/ktb.h @@ -789,6 +801,7 @@ brltty-ktb.$O: $(SRC_DIR)/ses.h brltty-ktb.$O: $(SRC_DIR)/scr.h brltty-ktb.$O: $(SRC_TOP)Headers/message.h brltty-ktb.$O: $(SRC_DIR)/update.h +brltty-ktb.$O: $(SRC_TOP)Headers/alert.h # Dependencies for brltty-trtxt.$O: brltty-trtxt.$O: $(SRC_DIR)/brltty-trtxt.c @@ -797,11 +810,13 @@ brltty-trtxt.$O: $(BLD_TOP)config.h brltty-trtxt.$O: $(BLD_TOP)forbuild.h brltty-trtxt.$O: $(SRC_TOP)Headers/pid.h brltty-trtxt.$O: $(SRC_TOP)Headers/program.h -brltty-trtxt.$O: $(SRC_TOP)Headers/file.h -brltty-trtxt.$O: $(SRC_TOP)Headers/get_sockets.h +brltty-trtxt.$O: $(SRC_TOP)Headers/datafile.h brltty-trtxt.$O: $(SRC_TOP)Headers/options.h brltty-trtxt.$O: $(SRC_TOP)Headers/strfmth.h +brltty-trtxt.$O: $(SRC_TOP)Headers/variables.h brltty-trtxt.$O: $(SRC_TOP)Headers/log.h +brltty-trtxt.$O: $(SRC_TOP)Headers/file.h +brltty-trtxt.$O: $(SRC_TOP)Headers/get_sockets.h brltty-trtxt.$O: $(SRC_TOP)Headers/unicode.h brltty-trtxt.$O: $(SRC_TOP)Headers/charset.h brltty-trtxt.$O: $(SRC_TOP)Headers/lock.h @@ -818,9 +833,11 @@ brltty-ttb.$O: $(SRC_TOP)Headers/strfmt.h brltty-ttb.$O: $(SRC_TOP)Headers/strfmth.h brltty-ttb.$O: $(SRC_TOP)Headers/pid.h brltty-ttb.$O: $(SRC_TOP)Headers/program.h +brltty-ttb.$O: $(SRC_TOP)Headers/datafile.h +brltty-ttb.$O: $(SRC_TOP)Headers/options.h +brltty-ttb.$O: $(SRC_TOP)Headers/variables.h brltty-ttb.$O: $(SRC_TOP)Headers/file.h brltty-ttb.$O: $(SRC_TOP)Headers/get_sockets.h -brltty-ttb.$O: $(SRC_TOP)Headers/options.h brltty-ttb.$O: $(SRC_TOP)Headers/get_select.h brltty-ttb.$O: $(SRC_TOP)Headers/brl_dots.h brltty-ttb.$O: $(SRC_TOP)Headers/charset.h @@ -830,7 +847,6 @@ brltty-ttb.$O: $(SRC_TOP)Headers/bitmask.h brltty-ttb.$O: $(SRC_TOP)Headers/dataarea.h brltty-ttb.$O: $(SRC_TOP)Headers/unicode.h brltty-ttb.$O: $(SRC_DIR)/ttb_internal.h -brltty-ttb.$O: $(SRC_TOP)Headers/datafile.h brltty-ttb.$O: $(SRC_DIR)/ttb_compile.h brltty-ttb.$O: $(SRC_TOP)Headers/get_curses.h brltty-ttb.$O: brlapi.h @@ -843,12 +859,12 @@ brltty-tune.$O: $(SRC_TOP)Headers/prologue.h brltty-tune.$O: $(BLD_TOP)config.h brltty-tune.$O: $(BLD_TOP)forbuild.h brltty-tune.$O: $(SRC_TOP)Headers/log.h -brltty-tune.$O: $(SRC_TOP)Headers/file.h -brltty-tune.$O: $(SRC_TOP)Headers/get_sockets.h +brltty-tune.$O: $(SRC_TOP)Headers/datafile.h brltty-tune.$O: $(SRC_TOP)Headers/options.h brltty-tune.$O: $(SRC_TOP)Headers/pid.h brltty-tune.$O: $(SRC_TOP)Headers/program.h brltty-tune.$O: $(SRC_TOP)Headers/strfmth.h +brltty-tune.$O: $(SRC_TOP)Headers/variables.h brltty-tune.$O: $(SRC_TOP)Headers/prefs.h brltty-tune.$O: $(SRC_TOP)Headers/tune_types.h brltty-tune.$O: $(SRC_TOP)Headers/tune_utils.h @@ -1020,6 +1036,7 @@ cmd_clipboard.$O: $(SRC_TOP)Headers/queue.h cmd_clipboard.$O: $(SRC_TOP)Headers/file.h cmd_clipboard.$O: $(SRC_TOP)Headers/get_sockets.h cmd_clipboard.$O: $(SRC_TOP)Headers/datafile.h +cmd_clipboard.$O: $(SRC_TOP)Headers/variables.h cmd_clipboard.$O: $(SRC_TOP)Headers/charset.h cmd_clipboard.$O: $(SRC_TOP)Headers/lock.h cmd_clipboard.$O: $(SRC_TOP)Headers/api_types.h @@ -1449,6 +1466,7 @@ cmd_utils.$O: $(BLD_TOP)config.h cmd_utils.$O: $(BLD_TOP)forbuild.h cmd_utils.$O: $(SRC_TOP)Headers/strfmt.h cmd_utils.$O: $(SRC_TOP)Headers/strfmth.h +cmd_utils.$O: $(SRC_TOP)Headers/alert.h cmd_utils.$O: $(SRC_TOP)Headers/brl_cmds.h cmd_utils.$O: $(SRC_TOP)Headers/brl_dots.h cmd_utils.$O: $(SRC_TOP)Headers/unicode.h @@ -1519,6 +1537,7 @@ config.$O: $(SRC_DIR)/scr_special.h config.$O: $(SRC_TOP)Headers/status_types.h config.$O: $(SRC_DIR)/status.h config.$O: $(SRC_DIR)/blink.h +config.$O: $(SRC_TOP)Headers/variables.h config.$O: $(SRC_TOP)Headers/datafile.h config.$O: $(SRC_TOP)Headers/ttb.h config.$O: $(SRC_TOP)Headers/atb.h @@ -1591,6 +1610,7 @@ core.$O: $(SRC_TOP)Headers/async.h core.$O: $(SRC_TOP)Headers/async_wait.h core.$O: $(SRC_TOP)Headers/async_event.h core.$O: $(SRC_TOP)Headers/async_signal.h +core.$O: $(SRC_TOP)Headers/async_alarm.h core.$O: $(SRC_TOP)Headers/alert.h core.$O: $(SRC_TOP)Headers/ctb.h core.$O: $(SRC_TOP)Headers/ctb_types.h @@ -1632,6 +1652,7 @@ ctb_compile.$O: $(SRC_TOP)Headers/ctb.h ctb_compile.$O: $(SRC_TOP)Headers/ctb_types.h ctb_compile.$O: $(SRC_DIR)/ctb_internal.h ctb_compile.$O: $(SRC_TOP)Headers/datafile.h +ctb_compile.$O: $(SRC_TOP)Headers/variables.h ctb_compile.$O: $(SRC_TOP)Headers/dataarea.h ctb_compile.$O: $(SRC_TOP)Headers/brl_dots.h ctb_compile.$O: $(SRC_TOP)Headers/hostcmd.h @@ -1676,6 +1697,7 @@ datafile.$O: $(SRC_TOP)Headers/file.h datafile.$O: $(SRC_TOP)Headers/get_sockets.h datafile.$O: $(SRC_TOP)Headers/queue.h datafile.$O: $(SRC_TOP)Headers/datafile.h +datafile.$O: $(SRC_TOP)Headers/variables.h datafile.$O: $(SRC_TOP)Headers/charset.h datafile.$O: $(SRC_TOP)Headers/lock.h datafile.$O: $(SRC_TOP)Headers/unicode.h @@ -2060,6 +2082,7 @@ ktb_compile.$O: $(SRC_TOP)Headers/log.h ktb_compile.$O: $(SRC_TOP)Headers/file.h ktb_compile.$O: $(SRC_TOP)Headers/get_sockets.h ktb_compile.$O: $(SRC_TOP)Headers/datafile.h +ktb_compile.$O: $(SRC_TOP)Headers/variables.h ktb_compile.$O: $(SRC_TOP)Headers/cmd.h ktb_compile.$O: $(SRC_TOP)Headers/cmd_types.h ktb_compile.$O: $(SRC_TOP)Headers/strfmth.h @@ -2245,6 +2268,8 @@ menu_prefs.$O: $(SRC_TOP)Headers/ttb.h menu_prefs.$O: $(SRC_TOP)Headers/atb.h menu_prefs.$O: $(SRC_TOP)Headers/ctb.h menu_prefs.$O: $(SRC_TOP)Headers/ctb_types.h +menu_prefs.$O: $(SRC_TOP)Headers/ktb.h +menu_prefs.$O: $(SRC_TOP)Headers/ktb_types.h menu_prefs.$O: $(SRC_TOP)Headers/note_types.h menu_prefs.$O: $(SRC_TOP)Headers/tune.h menu_prefs.$O: $(SRC_TOP)Headers/tune_types.h @@ -2258,8 +2283,6 @@ menu_prefs.$O: $(SRC_TOP)Headers/cmd.h menu_prefs.$O: $(SRC_TOP)Headers/cmd_types.h menu_prefs.$O: $(SRC_TOP)Headers/driver.h menu_prefs.$O: $(SRC_TOP)Headers/gio_types.h -menu_prefs.$O: $(SRC_TOP)Headers/ktb.h -menu_prefs.$O: $(SRC_TOP)Headers/ktb_types.h menu_prefs.$O: $(SRC_TOP)Headers/queue.h menu_prefs.$O: $(SRC_TOP)Headers/scr_types.h menu_prefs.$O: $(SRC_TOP)Headers/serial_types.h @@ -2493,13 +2516,14 @@ options.$O: $(BLD_TOP)config.h options.$O: $(BLD_TOP)forbuild.h options.$O: $(SRC_TOP)Headers/pid.h options.$O: $(SRC_TOP)Headers/program.h -options.$O: $(SRC_TOP)Headers/file.h -options.$O: $(SRC_TOP)Headers/get_sockets.h +options.$O: $(SRC_TOP)Headers/datafile.h options.$O: $(SRC_TOP)Headers/options.h options.$O: $(SRC_TOP)Headers/strfmth.h +options.$O: $(SRC_TOP)Headers/variables.h options.$O: $(SRC_TOP)Headers/params.h options.$O: $(SRC_TOP)Headers/log.h -options.$O: $(SRC_TOP)Headers/datafile.h +options.$O: $(SRC_TOP)Headers/file.h +options.$O: $(SRC_TOP)Headers/get_sockets.h options.$O: $(SRC_TOP)Headers/charset.h options.$O: $(SRC_TOP)Headers/lock.h options.$O: $(SRC_TOP)Headers/parse.h @@ -2734,6 +2758,7 @@ prefs.$O: $(SRC_TOP)Headers/log.h prefs.$O: $(SRC_TOP)Headers/file.h prefs.$O: $(SRC_TOP)Headers/get_sockets.h prefs.$O: $(SRC_TOP)Headers/datafile.h +prefs.$O: $(SRC_TOP)Headers/variables.h prefs.$O: $(SRC_TOP)Headers/parse.h # Dependencies for prefs_table.$O: @@ -2768,6 +2793,7 @@ profile.$O: $(SRC_TOP)Headers/log.h profile.$O: $(SRC_DIR)/profile.h profile.$O: $(SRC_DIR)/profile_types.h profile.$O: $(SRC_TOP)Headers/datafile.h +profile.$O: $(SRC_TOP)Headers/variables.h profile.$O: $(SRC_TOP)Headers/file.h profile.$O: $(SRC_TOP)Headers/get_sockets.h profile.$O: $(SRC_TOP)Headers/charset.h @@ -3057,10 +3083,10 @@ scrtest.$O: $(BLD_TOP)config.h scrtest.$O: $(BLD_TOP)forbuild.h scrtest.$O: $(SRC_TOP)Headers/pid.h scrtest.$O: $(SRC_TOP)Headers/program.h -scrtest.$O: $(SRC_TOP)Headers/file.h -scrtest.$O: $(SRC_TOP)Headers/get_sockets.h +scrtest.$O: $(SRC_TOP)Headers/datafile.h scrtest.$O: $(SRC_TOP)Headers/options.h scrtest.$O: $(SRC_TOP)Headers/strfmth.h +scrtest.$O: $(SRC_TOP)Headers/variables.h scrtest.$O: $(SRC_TOP)Headers/log.h scrtest.$O: $(SRC_TOP)Headers/parse.h scrtest.$O: $(SRC_TOP)Headers/driver.h @@ -3353,14 +3379,16 @@ spktest.$O: $(BLD_TOP)config.h spktest.$O: $(BLD_TOP)forbuild.h spktest.$O: $(SRC_TOP)Headers/pid.h spktest.$O: $(SRC_TOP)Headers/program.h -spktest.$O: $(SRC_TOP)Headers/file.h -spktest.$O: $(SRC_TOP)Headers/get_sockets.h +spktest.$O: $(SRC_TOP)Headers/datafile.h spktest.$O: $(SRC_TOP)Headers/options.h spktest.$O: $(SRC_TOP)Headers/strfmth.h +spktest.$O: $(SRC_TOP)Headers/variables.h spktest.$O: $(SRC_TOP)Headers/log.h spktest.$O: $(SRC_TOP)Headers/driver.h spktest.$O: $(SRC_TOP)Headers/spk.h spktest.$O: $(SRC_TOP)Headers/spk_types.h +spktest.$O: $(SRC_TOP)Headers/file.h +spktest.$O: $(SRC_TOP)Headers/get_sockets.h spktest.$O: $(SRC_TOP)Headers/parse.h spktest.$O: $(SRC_TOP)Headers/async.h spktest.$O: $(SRC_TOP)Headers/async_wait.h @@ -3522,13 +3550,15 @@ tbl2hex.$O: $(SRC_DIR)/tbl2hex.c tbl2hex.$O: $(SRC_TOP)Headers/prologue.h tbl2hex.$O: $(BLD_TOP)config.h tbl2hex.$O: $(BLD_TOP)forbuild.h -tbl2hex.$O: $(SRC_TOP)Headers/file.h -tbl2hex.$O: $(SRC_TOP)Headers/get_sockets.h +tbl2hex.$O: $(SRC_TOP)Headers/datafile.h tbl2hex.$O: $(SRC_TOP)Headers/options.h tbl2hex.$O: $(SRC_TOP)Headers/pid.h tbl2hex.$O: $(SRC_TOP)Headers/program.h tbl2hex.$O: $(SRC_TOP)Headers/strfmth.h +tbl2hex.$O: $(SRC_TOP)Headers/variables.h tbl2hex.$O: $(SRC_TOP)Headers/log.h +tbl2hex.$O: $(SRC_TOP)Headers/file.h +tbl2hex.$O: $(SRC_TOP)Headers/get_sockets.h tbl2hex.$O: $(SRC_TOP)Headers/ttb.h tbl2hex.$O: $(SRC_TOP)Headers/bitmask.h tbl2hex.$O: $(SRC_TOP)Headers/dataarea.h @@ -3577,6 +3607,7 @@ ttb_compile.$O: $(SRC_TOP)Headers/log.h ttb_compile.$O: $(SRC_TOP)Headers/file.h ttb_compile.$O: $(SRC_TOP)Headers/get_sockets.h ttb_compile.$O: $(SRC_TOP)Headers/datafile.h +ttb_compile.$O: $(SRC_TOP)Headers/variables.h ttb_compile.$O: $(SRC_TOP)Headers/dataarea.h ttb_compile.$O: $(SRC_TOP)Headers/charset.h ttb_compile.$O: $(SRC_TOP)Headers/lock.h @@ -3597,6 +3628,7 @@ ttb_gnome.$O: $(SRC_TOP)Headers/dataarea.h ttb_gnome.$O: $(SRC_TOP)Headers/unicode.h ttb_gnome.$O: $(SRC_DIR)/ttb_internal.h ttb_gnome.$O: $(SRC_TOP)Headers/datafile.h +ttb_gnome.$O: $(SRC_TOP)Headers/variables.h ttb_gnome.$O: $(SRC_DIR)/ttb_compile.h # Dependencies for ttb_louis.$O: @@ -3610,6 +3642,7 @@ ttb_louis.$O: $(SRC_TOP)Headers/dataarea.h ttb_louis.$O: $(SRC_TOP)Headers/unicode.h ttb_louis.$O: $(SRC_DIR)/ttb_internal.h ttb_louis.$O: $(SRC_TOP)Headers/datafile.h +ttb_louis.$O: $(SRC_TOP)Headers/variables.h ttb_louis.$O: $(SRC_DIR)/ttb_compile.h # Dependencies for ttb_native.$O: @@ -3625,6 +3658,7 @@ ttb_native.$O: $(SRC_TOP)Headers/dataarea.h ttb_native.$O: $(SRC_TOP)Headers/unicode.h ttb_native.$O: $(SRC_DIR)/ttb_internal.h ttb_native.$O: $(SRC_TOP)Headers/datafile.h +ttb_native.$O: $(SRC_TOP)Headers/variables.h ttb_native.$O: $(SRC_DIR)/ttb_compile.h # Dependencies for ttb_translate.$O: @@ -3678,6 +3712,8 @@ tune_build.$O: $(SRC_TOP)Headers/tune.h tune_build.$O: $(SRC_TOP)Headers/tune_build.h tune_build.$O: $(SRC_TOP)Headers/tune_types.h tune_build.$O: $(SRC_TOP)Headers/notes.h +tune_build.$O: $(SRC_TOP)Headers/charset.h +tune_build.$O: $(SRC_TOP)Headers/lock.h # Dependencies for tune_utils.$O: tune_utils.$O: $(SRC_DIR)/tune_utils.c @@ -3775,6 +3811,7 @@ usb.$O: $(SRC_TOP)Headers/device.h usb.$O: $(SRC_TOP)Headers/timing.h usb.$O: $(SRC_TOP)Headers/async.h usb.$O: $(SRC_TOP)Headers/async_wait.h +usb.$O: $(SRC_TOP)Headers/async_alarm.h usb.$O: $(SRC_TOP)Headers/io_misc.h usb.$O: $(SRC_TOP)Headers/async_io.h usb.$O: $(SRC_TOP)Headers/io_usb.h @@ -3834,6 +3871,8 @@ usb_cdc_acm.$O: $(SRC_TOP)Headers/prologue.h usb_cdc_acm.$O: $(BLD_TOP)config.h usb_cdc_acm.$O: $(BLD_TOP)forbuild.h usb_cdc_acm.$O: $(SRC_TOP)Headers/log.h +usb_cdc_acm.$O: $(SRC_TOP)Headers/strfmt.h +usb_cdc_acm.$O: $(SRC_TOP)Headers/strfmth.h usb_cdc_acm.$O: $(SRC_TOP)Headers/async.h usb_cdc_acm.$O: $(SRC_TOP)Headers/async_io.h usb_cdc_acm.$O: $(SRC_TOP)Headers/io_usb.h @@ -4102,6 +4141,19 @@ usb_solaris.$O: $(SRC_TOP)Headers/bitfield.h usb_solaris.$O: $(SRC_TOP)Headers/queue.h usb_solaris.$O: $(SRC_DIR)/usb_internal.h +# Dependencies for variables.$O: +variables.$O: $(SRC_DIR)/variables.c +variables.$O: $(SRC_TOP)Headers/prologue.h +variables.$O: $(BLD_TOP)config.h +variables.$O: $(BLD_TOP)forbuild.h +variables.$O: $(SRC_TOP)Headers/log.h +variables.$O: $(SRC_TOP)Headers/strfmt.h +variables.$O: $(SRC_TOP)Headers/strfmth.h +variables.$O: $(SRC_TOP)Headers/variables.h +variables.$O: $(SRC_TOP)Headers/queue.h +variables.$O: $(SRC_TOP)Headers/charset.h +variables.$O: $(SRC_TOP)Headers/lock.h + # Dependencies for xbrlapi.$O: xbrlapi.$O: $(SRC_DIR)/xbrlapi.c xbrlapi.$O: $(SRC_TOP)Headers/prologue.h @@ -4110,10 +4162,10 @@ xbrlapi.$O: $(BLD_TOP)forbuild.h xbrlapi.$O: brlapi.h xbrlapi.$O: brlapi_constants.h xbrlapi.$O: $(SRC_DIR)/brlapi_keycodes.h -xbrlapi.$O: $(SRC_TOP)Headers/file.h -xbrlapi.$O: $(SRC_TOP)Headers/get_sockets.h +xbrlapi.$O: $(SRC_TOP)Headers/datafile.h xbrlapi.$O: $(SRC_TOP)Headers/options.h xbrlapi.$O: $(SRC_TOP)Headers/pid.h xbrlapi.$O: $(SRC_TOP)Headers/program.h xbrlapi.$O: $(SRC_TOP)Headers/strfmth.h +xbrlapi.$O: $(SRC_TOP)Headers/variables.h diff --git a/Programs/report.c b/Programs/report.c index 278ae5d97b3abb4208f141c764e6cf78cf1a196b..5ad35e43562c78c5ae848148cd81c5487e9aea2b 100644 --- a/Programs/report.c +++ b/Programs/report.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/revision.c b/Programs/revision.c index 3ce9cd30d2b15c5fecb2974cd2b7a817de36c15d..d03577768f2e29ea91915a3bc5a3fbce4226d676 100644 --- a/Programs/revision.c +++ b/Programs/revision.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/revision_identifier.h b/Programs/revision_identifier.h index 0a7ab2293be70a65c8381228840fe094f8488e9f..2b2a9354b64d523cf1ebd69dd332026e330fac43 100644 --- a/Programs/revision_identifier.h +++ b/Programs/revision_identifier.h @@ -1 +1 @@ -"BRLTTY-5.3.1" +"BRLTTY-5.4" diff --git a/Programs/routing.c b/Programs/routing.c index fc602097f0be1118ba575e8ec969e933dc0a373b..3e1490c893c20107bbb924cb6f9fdd50239902b0 100644 --- a/Programs/routing.c +++ b/Programs/routing.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/routing.h b/Programs/routing.h index a9c0c3ca0411437ffe266558eb6e063aaadb7380..f1ce654b66c9d92bb96379827aa2714866c5530d 100644 --- a/Programs/routing.h +++ b/Programs/routing.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr.c b/Programs/scr.c index f1312afd9da2f8865aa292e19131c356d108a66e..b5241c6bbf17d5baf172b9f3e953c5636c380703 100644 --- a/Programs/scr.c +++ b/Programs/scr.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr.h b/Programs/scr.h index 8165f138da3db7f723a62d3be2f6d8aeb8a20978..39b443ca00b25106437a2708de2c95df8fc2f1a0 100644 --- a/Programs/scr.h +++ b/Programs/scr.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_base.c b/Programs/scr_base.c index b2dbd82c418286cec412717a785cb11f2ec33d03..c671a6d451b5419e5b2b7fd082f8bd7fde3e13aa 100644 --- a/Programs/scr_base.c +++ b/Programs/scr_base.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_driver.c b/Programs/scr_driver.c index f7b4e091d10b8fb63cafaa2d882420d7916630b7..16d60d749718b24d8d7c9df5629bd97c3a788989 100644 --- a/Programs/scr_driver.c +++ b/Programs/scr_driver.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_frozen.c b/Programs/scr_frozen.c index 47c13fd41ba91332ce422296190c6dee4b10fa36..3747a8171b56f61393c5f3e45c44373c86c49b3b 100644 --- a/Programs/scr_frozen.c +++ b/Programs/scr_frozen.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_frozen.h b/Programs/scr_frozen.h index 63d00e2c1a4ae1caf455db7036ebbba9273e3322..e90c7183e972f7e83c78949c0d3ab766e8771c50 100644 --- a/Programs/scr_frozen.h +++ b/Programs/scr_frozen.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_gpm.c b/Programs/scr_gpm.c index 2c55647c5be7e4fe2fa2958f3edfe82561c16fb0..3f524a9315d9c8c485d54d22c6ecb0aeb8916cc3 100644 --- a/Programs/scr_gpm.c +++ b/Programs/scr_gpm.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_help.c b/Programs/scr_help.c index 843b7c1ad1ce2bf1f5c1fd15770577301f8ce10b..f96f8755b370228d149ccf7c25b42a7311f25690 100644 --- a/Programs/scr_help.c +++ b/Programs/scr_help.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_help.h b/Programs/scr_help.h index 6503baf10596e6f361db70f4dbf759e92fb68932..48b42448cfc1cd58db311b4496069e1c3b7e37f7 100644 --- a/Programs/scr_help.h +++ b/Programs/scr_help.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_internal.h b/Programs/scr_internal.h index e2e23a1003be50c451bf4d4757568beeea5fd31a..e47892480b7a443b537733f95263ba909716574a 100644 --- a/Programs/scr_internal.h +++ b/Programs/scr_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_main.c b/Programs/scr_main.c index 20a63723d06a967fca8b34df0ac4d34a42250576..82109e5f4570f3be84cede8be82d28a45aa7542e 100644 --- a/Programs/scr_main.c +++ b/Programs/scr_main.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_menu.c b/Programs/scr_menu.c index c99944257db7796d9a3e6a9490856924718c9bb8..262d85d6387e48565e9bb38bb128e3cedf0753a8 100644 --- a/Programs/scr_menu.c +++ b/Programs/scr_menu.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_menu.h b/Programs/scr_menu.h index b5709f609892f232605a2b43a380eada9a65c5c0..03a1f17f678536f68eb250b34c3d11bce04d7a5d 100644 --- a/Programs/scr_menu.h +++ b/Programs/scr_menu.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_real.c b/Programs/scr_real.c index b9a063bf46ed0c7b2dcb603764b2417a4ed0e28c..fdfcc61e1a3d0eaf26a7d8dd1b09106419966466 100644 --- a/Programs/scr_real.c +++ b/Programs/scr_real.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_special.c b/Programs/scr_special.c index aa002e68cc1735f16e62e1be067d35d6c60fdf29..4341a230a6eaa7a4d70c354fd2b14e91a715af15 100644 --- a/Programs/scr_special.c +++ b/Programs/scr_special.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_special.h b/Programs/scr_special.h index 418e158f292dcf841afcdc030c075e344c780a96..080ade411e198d20b3db12f1d52bb345eb053938 100644 --- a/Programs/scr_special.h +++ b/Programs/scr_special.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scr_utils.c b/Programs/scr_utils.c index ea0619615b295d379c02d424319de1a477078c8f..ff52bae64fcaf26311ca9845890cf2bfef5cecd7 100644 --- a/Programs/scr_utils.c +++ b/Programs/scr_utils.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/scrtest.c b/Programs/scrtest.c index 06e764345c324d8d1517e379e272ab7ea713d686..a13f6d86ad5ec3c27b5b15ad91ed43864d177472 100644 --- a/Programs/scrtest.c +++ b/Programs/scrtest.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -16,10 +16,6 @@ * This software is maintained by Dave Mielke . */ -/* scrtest.c - Test program for the screen reading library - * $Id: scrtest.c,v 1.3 1996/09/24 01:04:27 nn201 Exp $ - */ - #include "prologue.h" #include diff --git a/Programs/serial.c b/Programs/serial.c index 2d418ebf9325993847ccc8fbb9d27692dac7437b..93eadf7dd8a7a44a16424e4cf3526ef89f538b9c 100644 --- a/Programs/serial.c +++ b/Programs/serial.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_grub.c b/Programs/serial_grub.c index 73909bc8460def0c34211c0768c1f1645a746060..bc9702ae9946073dd962c0b441a73cd1214e2938 100644 --- a/Programs/serial_grub.c +++ b/Programs/serial_grub.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_grub.h b/Programs/serial_grub.h index e71bcd6c57b22ea475a051404a539fd467ecbb5c..4859a19d648754a75d66220b000f8686e4fe331d 100644 --- a/Programs/serial_grub.h +++ b/Programs/serial_grub.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_internal.h b/Programs/serial_internal.h index 2d0ed6f258473ed099b58b21a58d19117531a0cd..c47ba9cbd92a5ae8d77667a30ea47e35549acb78 100644 --- a/Programs/serial_internal.h +++ b/Programs/serial_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_msdos.c b/Programs/serial_msdos.c index ed893dc0ef2e2a063442d4e194afe225addab36b..686c736a69bca446395cbb25d35048bc5e1fc982 100644 --- a/Programs/serial_msdos.c +++ b/Programs/serial_msdos.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_msdos.h b/Programs/serial_msdos.h index e844976025c9d4091c7d9c88f71187fbeb826936..2a7e2d6c052e5710dfae3c00eaf4504ba4b94157 100644 --- a/Programs/serial_msdos.h +++ b/Programs/serial_msdos.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_none.c b/Programs/serial_none.c index b9f600956631d8ff59ecedfa9a60a00bf19c2513..cd053ea8f57809408ea9d4ccf5d461544e033b1e 100644 --- a/Programs/serial_none.c +++ b/Programs/serial_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_none.h b/Programs/serial_none.h index acb95a5c5e7f37fb2cb45cf6888b5c8af1857b0c..dce5068ce48d3734cd6a69476b490f3343e344d2 100644 --- a/Programs/serial_none.h +++ b/Programs/serial_none.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_termios.c b/Programs/serial_termios.c index 6815cfa6815a6d485d6e977bcce50fe239a62dd1..8a43d25655f014e8194f662d2c9b612e03183573 100644 --- a/Programs/serial_termios.c +++ b/Programs/serial_termios.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -517,7 +517,9 @@ serialConnectDevice (SerialDevice *serial, const char *device) { close(serial->fileDescriptor); } else { - logMessage(LOG_ERR, "cannot open serial device: %s: %s", device, strerror(errno)); + logMessage(((errno == ENOENT)? LOG_DEBUG: LOG_ERR), + "cannot open serial device: %s: %s", + device, strerror(errno)); } return 0; diff --git a/Programs/serial_termios.h b/Programs/serial_termios.h index d8bc7c06f8e75c1be52b009efc23ff015d2356b1..e0d03234c21302c6658e1e8b758e38a43c76f7cb 100644 --- a/Programs/serial_termios.h +++ b/Programs/serial_termios.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_uart.h b/Programs/serial_uart.h index 0ebbbc40bb9812af672609dfb32b82488b6eb352..d4768e8a7e06d861b8396d74105bad84ccfffe02 100644 --- a/Programs/serial_uart.h +++ b/Programs/serial_uart.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_windows.c b/Programs/serial_windows.c index a7cf38d15b90797271f80749ecec8e5973a22a3d..64beabe47b5412b73b70a68bb07ea0bc9c93c93f 100644 --- a/Programs/serial_windows.c +++ b/Programs/serial_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/serial_windows.h b/Programs/serial_windows.h index 55317a29ccf2c47a3efe54b752cd6c2051dd06a0..94976d0b62938840627ab21eda0d1da7c0a81ffa 100644 --- a/Programs/serial_windows.h +++ b/Programs/serial_windows.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/service_libsystemd.c b/Programs/service_libsystemd.c index 2e6dacba0ec83f0ef99906f8341e6581b4181a11..402c3c8388237e4ada982c19ed39c55a0c0acb47 100644 --- a/Programs/service_libsystemd.c +++ b/Programs/service_libsystemd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/service_none.c b/Programs/service_none.c index 8d732ccf9588c4ad9202094ff2caa92ffd28181b..0990cf992f128e6211fe4383c7ca3cd92f68daf4 100644 --- a/Programs/service_none.c +++ b/Programs/service_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/service_windows.c b/Programs/service_windows.c index c52f2f965067ee5f9513210700a80b67cf9abbd4..9cbf575b428758829445fb55124507c5c51c8d9e 100644 --- a/Programs/service_windows.c +++ b/Programs/service_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ses.c b/Programs/ses.c index 466706b04526d2839304b4b6ce447cd3a217d91b..bed009c4a342dd6fa6614ad275f88783cfbd1d58 100644 --- a/Programs/ses.c +++ b/Programs/ses.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/ses.h b/Programs/ses.h index 696a737e72370fc0f3ee49ce756137fbda3ff900..bb83c61d9454f5ad4cc320b7b4c967677fb11907 100644 --- a/Programs/ses.h +++ b/Programs/ses.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -42,6 +42,7 @@ typedef struct { int winx, winy; /* upper-left corner of braille window */ int motx, moty; /* last user motion of braille window */ int trkx, trky; /* tracked cursor position */ + int dctx, dcty; /* initial cursor position */ int ptrx, ptry; /* last known screen pointer position */ int spkx, spky; /* current speech position */ diff --git a/Programs/spk.c b/Programs/spk.c index 87427f206375f1e63acfa14c6406ed35c9eb5742..569315bbd9fd9486a7e0d3dcbf8dd0d3195654ee 100644 --- a/Programs/spk.c +++ b/Programs/spk.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spk_base.c b/Programs/spk_base.c index 24929361011c6be803793efd77dc94307f0ebf20..9ba1e6fd30ae7efd1a329eb922332516102d6be2 100644 --- a/Programs/spk_base.c +++ b/Programs/spk_base.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spk_driver.c b/Programs/spk_driver.c index 1e6fd35f7faad74b397eb60a825b22efd44af7ed..8cadbf82614d3bd1cba696e1601c9b4f18da6870 100644 --- a/Programs/spk_driver.c +++ b/Programs/spk_driver.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spk_input.c b/Programs/spk_input.c index 56caf83860f84d4c1128ff031bc26155a73222a5..d33751efda209ea15b670c07b23651b6f7864979 100644 --- a/Programs/spk_input.c +++ b/Programs/spk_input.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spk_input.h b/Programs/spk_input.h index 57f4071cbcf5d919a0ea2e52be07886d5e1526e0..3aa159a69218588f8088357b478bdd70c7cfc9b2 100644 --- a/Programs/spk_input.h +++ b/Programs/spk_input.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spk_thread.c b/Programs/spk_thread.c index ae5096ffd3818f0e8180e2bb849d9d943dfef252..288518c42b38733902b631c118ce68cf9d77938d 100644 --- a/Programs/spk_thread.c +++ b/Programs/spk_thread.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spk_thread.h b/Programs/spk_thread.h index f47ce20f29b700fcbd1791779499d0e624c89d13..5634dce5708a43defd779983dc249ac01af7ae42 100644 --- a/Programs/spk_thread.h +++ b/Programs/spk_thread.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/spktest.c b/Programs/spktest.c index c7c41e4b27cab096e2ddf6da95047b727ad9b2c8..3bdeafaddfc98ee7589d9e97a3c38df1cfb56405 100644 --- a/Programs/spktest.c +++ b/Programs/spktest.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/status.c b/Programs/status.c index fb11b5af1ea9978e3d93ba5aa60f78e2ee1f35f9..09bbcf142229db772ce9ec4b29f94aab3c94fab1 100644 --- a/Programs/status.c +++ b/Programs/status.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -208,7 +208,7 @@ renderStatusField_generic (unsigned char *cells) { cells[gscBlinkingAttributes] = prefs.blinkingAttributes; cells[gscBlinkingCapitals] = prefs.blinkingCapitals; cells[gscAlertTunes] = prefs.alertTunes; - cells[gscAutorepeat] = prefs.autorepeat; + cells[gscAutorepeat] = prefs.autorepeatEnabled; cells[gscAutospeak] = prefs.autospeak; cells[gscBrailleInputMode] = prefs.brailleInputMode; } diff --git a/Programs/status.h b/Programs/status.h index 0553f7c98da0b2927f046f182a1f280ed777dd2b..829178f70eca9b4f8ecef114e15ea417d4c0b748 100644 --- a/Programs/status.h +++ b/Programs/status.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/sys_darwin.c b/Programs/sys_darwin.c index c5f767ff6f375c07eb76afc965084677877893ef..9c6f1cb5c7e7caa0df159291de1f0ddc9e8b9907 100644 --- a/Programs/sys_darwin.c +++ b/Programs/sys_darwin.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/sys_freebsd.c b/Programs/sys_freebsd.c index 9b4df2e926d77baa96784852a027aebc9ed1691d..191f1c614cb94660f8194d99bf5821cf67925315 100644 --- a/Programs/sys_freebsd.c +++ b/Programs/sys_freebsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/sys_kfreebsd.c b/Programs/sys_kfreebsd.c index 9b4df2e926d77baa96784852a027aebc9ed1691d..191f1c614cb94660f8194d99bf5821cf67925315 100644 --- a/Programs/sys_kfreebsd.c +++ b/Programs/sys_kfreebsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/sys_netbsd.c b/Programs/sys_netbsd.c index 3abeccf8f509c2a975444f204596f2a53322bf60..9ababacb1d2b4efc0764cfaa24005c135f17ec42 100644 --- a/Programs/sys_netbsd.c +++ b/Programs/sys_netbsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/sys_openbsd.c b/Programs/sys_openbsd.c index 3abeccf8f509c2a975444f204596f2a53322bf60..9ababacb1d2b4efc0764cfaa24005c135f17ec42 100644 --- a/Programs/sys_openbsd.c +++ b/Programs/sys_openbsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/sys_solaris.c b/Programs/sys_solaris.c index 2749e6df55f600c29e5fbbe10024113bf5a50017..6dc716cc38d4bf1221f643b3b962f041e06d55a0 100644 --- a/Programs/sys_solaris.c +++ b/Programs/sys_solaris.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/system_darwin.c b/Programs/system_darwin.c index 3b831fe8cd24759ff201cbd8ae2feb1eb47091e9..3c40f06d7bb38d651a0af8e454bbea79eac0f460 100644 --- a/Programs/system_darwin.c +++ b/Programs/system_darwin.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/system_java.c b/Programs/system_java.c index 88c8cf248fcf6d1c2ac8c892cce0850ec4e81057..98478eb412da40b6e719d2502cc3392d42575897 100644 --- a/Programs/system_java.c +++ b/Programs/system_java.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/system_linux.c b/Programs/system_linux.c index 6799f009c92cd82e106638211da4e40485cbedcf..3fe5ac1fdd5d08ddb9059fb527c7a674051f323b 100644 --- a/Programs/system_linux.c +++ b/Programs/system_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/system_msdos.c b/Programs/system_msdos.c index 4248cf4844e886359a3166343ba34287102ee8bf..c0fc0cd1536f76e5184e3a79131d7ea93fc33969 100644 --- a/Programs/system_msdos.c +++ b/Programs/system_msdos.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/system_none.c b/Programs/system_none.c index 635cc783074758ad968b2622dfc9c568b1b36371..d8063b5018e56f5ec659acac60620d64420b5cd3 100644 --- a/Programs/system_none.c +++ b/Programs/system_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/system_windows.c b/Programs/system_windows.c index 81ff9cc871ee196e6790c9d83eb1ee2aa99b7549..22858436330c370df7ab180a5060d5a7f102973e 100644 --- a/Programs/system_windows.c +++ b/Programs/system_windows.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/tbl2hex.c b/Programs/tbl2hex.c index 0bbb21c0cc067245e88bcfdd1bc79f285e1cdffd..48478b6e43dc37424734c5d82a3404910e29d909 100644 --- a/Programs/tbl2hex.c +++ b/Programs/tbl2hex.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/thread.c b/Programs/thread.c index b76eff20130fbf5d389180392d4f1b80697bfd3e..0eaa5631da065debab734edc53936f59903d5fa0 100644 --- a/Programs/thread.c +++ b/Programs/thread.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/timing.c b/Programs/timing.c index 42998be128ecbd8bb6e12877ca403a9d5ead2a13..af83591755099a4cabd2dc606cac8545b626bf03 100644 --- a/Programs/timing.c +++ b/Programs/timing.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -21,9 +21,9 @@ #include #include -#ifdef HAVE_GETTIMEOFDAY +#if defined(HAVE_GETTIMEOFDAY) || defined(HAVE_SETTIMEOFDAY) #include -#endif /* HAVE_GETTIMEOFDAY */ +#endif /* HAVE_(GET|SET)TIMEOFDAY */ #ifdef HAVE_SYS_POLL_H #include @@ -54,6 +54,9 @@ localtime_r (const time_t *timep, struct tm *result) { void getCurrentTime (TimeValue *now) { + now->seconds = 0; + now->nanoseconds = 0; + #if defined(GRUB_RUNTIME) static time_t baseSeconds = 0; static uint64_t baseMilliseconds; @@ -72,23 +75,63 @@ getCurrentTime (TimeValue *now) { #elif defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_REALTIME) struct timespec ts; - clock_gettime(CLOCK_REALTIME, &ts); - now->seconds = ts.tv_sec; - now->nanoseconds = ts.tv_nsec; + + if (clock_gettime(CLOCK_REALTIME, &ts) != -1) { + now->seconds = ts.tv_sec; + now->nanoseconds = ts.tv_nsec; + } else { + //logSystemError("clock_gettime"); + } #elif defined(HAVE_GETTIMEOFDAY) struct timeval tv; - gettimeofday(&tv, NULL); - now->seconds = tv.tv_sec; - now->nanoseconds = tv.tv_usec * USECS_PER_MSEC; + + if (gettimeofday(&tv, NULL) != -1) { + now->seconds = tv.tv_sec; + now->nanoseconds = tv.tv_usec * NSECS_PER_USEC; + } else { + //logSystemError("gettimeofday"); + } #elif defined(HAVE_TIME) now->seconds = time(NULL); - now->nanoseconds = 0; #else /* get current time */ - now->seconds = 0; - now->nanoseconds = 0; +#warning get current time not supported on this platform +#endif /* get current time */ +} + +void +setCurrentTime (const TimeValue *now) { +#if defined(HAVE_CLOCK_SETTIME) && defined(CLOCK_REALTIME) + const struct timespec ts = { + .tv_sec = now->seconds, + .tv_nsec = now->nanoseconds + }; + + if (clock_settime(CLOCK_REALTIME, &ts) == -1) { + logSystemError("clock_settime"); + } + +#elif defined(HAVE_SETTIMEOFDAY) + const struct timeval tv = { + .tv_sec = now->seconds, + .tv_usec = now->nanoseconds / NSECS_PER_USEC + }; + + if (settimeofday(&tv, NULL) == -1) { + logSystemError("settimeofday"); + } + +#elif defined(HAVE_STIME) + const time_t seconds = now->seconds; + + if (stime(&seconds) == -1) { + logSystemError("stime"); + } + +#else /* set current time */ +#warning set current time not supported on this platform #endif /* get current time */ } diff --git a/Programs/ttb_compile.c b/Programs/ttb_compile.c index 00e4036dc3d02ba68a56359f308f5fc11a847237..7777ff624a0766906ae476e3e83f1cddf8b94909 100644 --- a/Programs/ttb_compile.c +++ b/Programs/ttb_compile.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -318,12 +318,17 @@ finishTextTableData (TextTableData *ttd) { } TextTableData * -processTextTableLines (FILE *stream, const char *name, DataOperandsProcessor *processor) { +processTextTableLines (FILE *stream, const char *name, DataOperandsProcessor *processOperands) { if (setTableDataVariables(TEXT_TABLE_EXTENSION, TEXT_SUBTABLE_EXTENSION)) { TextTableData *ttd; if ((ttd = newTextTableData())) { - if (processDataStream(NULL, stream, name, processor, ttd)) { + const DataFileParameters parameters = { + .processOperands = processOperands, + .data = ttd + }; + + if (processDataStream(NULL, stream, name, ¶meters)) { if (finishTextTableData(ttd)) { return ttd; } @@ -341,8 +346,13 @@ makeTextTable (TextTableData *ttd) { TextTable *table = malloc(sizeof(*table)); if (table) { + memset(table, 0, sizeof(*table)); + table->header.fields = getTextTableHeader(ttd); table->size = getDataSize(ttd->area); + + table->options.tryBaseCharacter = 1; + resetDataArea(ttd->area); } diff --git a/Programs/ttb_compile.h b/Programs/ttb_compile.h index e308c71ccd849aff1dc27c956a7b2072c864eb20..c3271ae3990ccbc55898af1658a59096b4dc864d 100644 --- a/Programs/ttb_compile.h +++ b/Programs/ttb_compile.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -31,7 +31,7 @@ typedef struct TextTableDataStruct TextTableData; extern TextTableData *newTextTableData (void); extern void destroyTextTableData (TextTableData *ttd); -extern TextTableData *processTextTableLines (FILE *stream, const char *name, DataOperandsProcessor *processor); +extern TextTableData *processTextTableLines (FILE *stream, const char *name, DataOperandsProcessor *processOperands); extern TextTable *makeTextTable (TextTableData *ttd); typedef TextTableData *TextTableProcessor (FILE *stream, const char *name); diff --git a/Programs/ttb_gnome.c b/Programs/ttb_gnome.c index f5610e9aa815e30d5aa8e8f6330109eea21abae2..b2568fa9d78222a1fd85f9f519da9efb3f229f5b 100644 --- a/Programs/ttb_gnome.c +++ b/Programs/ttb_gnome.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -162,7 +162,7 @@ static DATA_OPERANDS_PROCESSOR(processUnicodeCharOperands) { return 1; } -static DATA_OPERANDS_PROCESSOR(processGnomeBrailleLine) { +static DATA_OPERANDS_PROCESSOR(processGnomeBrailleOperands) { if (inUcsBlock) { BEGIN_DATA_DIRECTIVE_TABLE {.name=WS_C("UCS-BLOCK"), .processor=processUcsBlockOperands}, @@ -193,7 +193,7 @@ processGnomeBrailleStream (FILE *stream, const char *name) { TextTableData *ttd; inUcsBlock = 0; - if ((ttd = processTextTableLines(stream, name, processGnomeBrailleLine))) { + if ((ttd = processTextTableLines(stream, name, processGnomeBrailleOperands))) { if (inUcsBlock) { reportDataError(NULL, "unterminated UCS block"); } diff --git a/Programs/ttb_internal.h b/Programs/ttb_internal.h index 9e753d962b5fdf803fcdd0dc3ffd9f1ca830c17f..744cc74cffdf95a47638d60c6bb53f9b77f1f8dc 100644 --- a/Programs/ttb_internal.h +++ b/Programs/ttb_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -67,6 +67,10 @@ struct TextTableStruct { } header; size_t size; + + struct { + unsigned char tryBaseCharacter; + } options; }; extern const TextTableAliasEntry *locateTextTableAlias ( diff --git a/Programs/ttb_louis.c b/Programs/ttb_louis.c index 8e20a2aebe7294b0df9b764810ae91c25545a0fa..bfa8350b23ca5a09b2587b0983114e7dcf6f920a 100644 --- a/Programs/ttb_louis.c +++ b/Programs/ttb_louis.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -132,7 +132,7 @@ static DATA_OPERANDS_PROCESSOR(processInclude) { return 1; } -static DATA_OPERANDS_PROCESSOR(processLibLouisLine) { +static DATA_OPERANDS_PROCESSOR(processLibLouisOperands) { BEGIN_DATA_DIRECTIVE_TABLE {.name=WS_C("space"), .processor=processChar}, {.name=WS_C("punctuation"), .processor=processChar}, @@ -154,5 +154,5 @@ static DATA_OPERANDS_PROCESSOR(processLibLouisLine) { TextTableData * processLibLouisStream (FILE *stream, const char *name) { - return processTextTableLines(stream, name, processLibLouisLine); + return processTextTableLines(stream, name, processLibLouisOperands); } diff --git a/Programs/ttb_native.c b/Programs/ttb_native.c index f5eff8f7bee691014637dbf85231cc2317b61d7c..966582caabf2074186823296fd48a2ce2a74be28 100644 --- a/Programs/ttb_native.c +++ b/Programs/ttb_native.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -193,7 +193,7 @@ static DATA_OPERANDS_PROCESSOR(processGlyphOperands) { return 1; } -static DATA_OPERANDS_PROCESSOR(processTextTableLine) { +static DATA_OPERANDS_PROCESSOR(processNativeTextTableOperands) { BEGIN_DATA_DIRECTIVE_TABLE DATA_NESTING_DIRECTIVES, DATA_VARIABLE_DIRECTIVES, @@ -209,7 +209,7 @@ static DATA_OPERANDS_PROCESSOR(processTextTableLine) { TextTableData * processTextTableStream (FILE *stream, const char *name) { - return processTextTableLines(stream, name, processTextTableLine); + return processTextTableLines(stream, name, processNativeTextTableOperands); } TextTable * diff --git a/Programs/ttb_translate.c b/Programs/ttb_translate.c index 346081d748830ab9dd7a819bf7f3cb9e513fd340..e5ad47efa797e9aa59ffdcbda11d93474033b618 100644 --- a/Programs/ttb_translate.c +++ b/Programs/ttb_translate.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -86,6 +86,11 @@ getUnicodeCellEntry (TextTable *table, wchar_t character) { return NULL; } +void +setTryBaseCharacter (TextTable *table, unsigned char yes) { + table->options.tryBaseCharacter = yes; +} + static int searchTextTableAlias (const void *target, const void *element) { const wchar_t *reference = target; @@ -145,11 +150,6 @@ convertCharacterToDots (TextTable *table, wchar_t character) { } default: { - SetBrailleRepresentationData sbr = { - .table = table, - .dots = 0 - }; - { unsigned int counter = 0; @@ -177,8 +177,15 @@ convertCharacterToDots (TextTable *table, wchar_t character) { } } - if (handleBestCharacter(character, setBrailleRepresentation, &sbr)) { - return sbr.dots; + if (table->options.tryBaseCharacter) { + SetBrailleRepresentationData sbr = { + .table = table, + .dots = 0 + }; + + if (handleBestCharacter(character, setBrailleRepresentation, &sbr)) { + return sbr.dots; + } } break; diff --git a/Programs/tune.c b/Programs/tune.c index 12c67ffc72f2a4be5c046a5d5c68ed78755efaf4..29b7260a76a790cd12584dc34efc910256c062bc 100644 --- a/Programs/tune.c +++ b/Programs/tune.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/tune_build.c b/Programs/tune_build.c index e9c19093d0cb757a86f8bc1b959072ee9efca258..faff68b42d483d2753bcfde7c15b4b2752e46a76 100644 --- a/Programs/tune_build.c +++ b/Programs/tune_build.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -27,72 +27,105 @@ #include "log.h" #include "tune_build.h" #include "notes.h" +#include "charset.h" -static const char noteLetters[] = "cdefgab"; +typedef unsigned int TuneNumber; + +typedef struct { + const char *name; + TuneNumber minimum; + TuneNumber maximum; + TuneNumber current; +} TuneParameter; + +struct TuneBuilderStruct { + TuneStatus status; + + struct { + ToneElement *array; + unsigned int size; + unsigned int count; + } tones; + + signed char accidentals[NOTES_PER_SCALE]; + TuneParameter duration; + TuneParameter note; + TuneParameter octave; + TuneParameter percentage; + TuneParameter tempo; + + struct { + const wchar_t *text; + const char *name; + unsigned int index; + } source; +}; + +static const wchar_t *noteLetters = WS_C("cdefgab"); static const unsigned char noteOffsets[] = {0, 2, 4, 5, 7, 9, 11}; static const signed char scaleAccidentals[] = {0, 2, 4, -1, 1, 3, 5}; static const unsigned char accidentalTable[] = {3, 0, 4, 1, 5, 2, 6}; typedef struct { - const char *name; + const wchar_t *name; signed char accidentals; } ModeEntry; static const ModeEntry modeTable[] = { - {.name="major", .accidentals=0}, - {.name="minor", .accidentals=-3}, - - {.name="ionian", .accidentals=0}, - {.name="dorian", .accidentals=-2}, - {.name="phrygian", .accidentals=-4}, - {.name="lydian", .accidentals=1}, - {.name="mixolydian", .accidentals=-1}, - {.name="aeolian", .accidentals=-3}, - {.name="locrian", .accidentals=-5}, + {.name=WS_C("major"), .accidentals=0}, + {.name=WS_C("minor"), .accidentals=-3}, + + {.name=WS_C("ionian"), .accidentals=0}, + {.name=WS_C("dorian"), .accidentals=-2}, + {.name=WS_C("phrygian"), .accidentals=-4}, + {.name=WS_C("lydian"), .accidentals=1}, + {.name=WS_C("mixolydian"), .accidentals=-1}, + {.name=WS_C("aeolian"), .accidentals=-3}, + {.name=WS_C("locrian"), .accidentals=-5}, }; static const unsigned char modeCount = ARRAY_COUNT(modeTable); static void -logSyntaxError (TuneBuilder *tune, const char *message) { - tune->status = TUNE_BUILD_SYNTAX; +logSyntaxError (TuneBuilder *tb, const char *message) { + tb->status = TUNE_STATUS_SYNTAX; - logMessage(LOG_ERR, "%s[%u]: %s: %s", - tune->source.name, tune->source.index, - message, tune->source.text); + logMessage(LOG_ERR, "tune error: %s[%u]: %s: %" PRIws, + tb->source.name, tb->source.index, + message, tb->source.text); } int -addTone (TuneBuilder *tune, const ToneElement *tone) { - if (tune->tones.count == tune->tones.size) { - unsigned int newSize = tune->tones.size? (tune->tones.size << 1): 1; +addTone (TuneBuilder *tb, const ToneElement *tone) { + if (tb->tones.count == tb->tones.size) { + unsigned int newSize = tb->tones.size? (tb->tones.size << 1): 1; ToneElement *newArray; - if (!(newArray = realloc(tune->tones.array, ARRAY_SIZE(newArray, newSize)))) { - tune->status = TUNE_BUILD_FATAL; + if (!(newArray = realloc(tb->tones.array, ARRAY_SIZE(newArray, newSize)))) { + tb->status = TUNE_STATUS_FATAL; logMallocError(); return 0; } - tune->tones.array = newArray; - tune->tones.size = newSize; + tb->tones.array = newArray; + tb->tones.size = newSize; } - tune->tones.array[tune->tones.count++] = *tone; + tb->tones.array[tb->tones.count++] = *tone; return 1; } int -addNote (TuneBuilder *tune, unsigned char note, int duration) { +addNote (TuneBuilder *tb, unsigned char note, int duration) { if (!duration) return 1; ToneElement tone = TONE_PLAY(duration, getNoteFrequency(note)); - return addTone(tune, &tone); + return addTone(tb, &tone); } static int parseNumber ( - TuneBuilder *tune, - TuneNumber *number, const char **operand, int required, + TuneBuilder *tb, + TuneNumber *number, const wchar_t **operand, int required, const TuneNumber minimum, const TuneNumber maximum, const char *name ) { @@ -100,8 +133,8 @@ parseNumber ( if (isdigit(**operand)) { errno = 0; - char *end; - unsigned long ul = strtoul(*operand, &end, 10); + wchar_t *end; + unsigned long ul = wcstoul(*operand, &end, 10); if (errno) goto PROBLEM_ENCOUNTERED; if (ul > UINT_MAX) goto PROBLEM_ENCOUNTERED; @@ -121,7 +154,7 @@ PROBLEM_ENCOUNTERED: if (name) { char message[0X80]; snprintf(message, sizeof(message), "%s %s", problem, name); - logSyntaxError(tune, message); + logSyntaxError(tb, message); } return 0; @@ -129,53 +162,53 @@ PROBLEM_ENCOUNTERED: static int parseParameter ( - TuneBuilder *tune, TuneParameter *parameter, - const char **operand, int required + TuneBuilder *tb, TuneParameter *parameter, + const wchar_t **operand, int required ) { - return parseNumber(tune, ¶meter->current, operand, required, + return parseNumber(tb, ¶meter->current, operand, required, parameter->minimum, parameter->maximum, parameter->name); } static int -parseOptionalParameter (TuneBuilder *tune, TuneParameter *parameter, const char **operand) { - return parseParameter(tune, parameter, operand, 0); +parseOptionalParameter (TuneBuilder *tb, TuneParameter *parameter, const wchar_t **operand) { + return parseParameter(tb, parameter, operand, 0); } static int -parseRequiredParameter (TuneBuilder *tune, TuneParameter *parameter, const char **operand) { - return parseParameter(tune, parameter, operand, 1); +parseRequiredParameter (TuneBuilder *tb, TuneParameter *parameter, const wchar_t **operand) { + return parseParameter(tb, parameter, operand, 1); } static int -parsePercentage (TuneBuilder *tune, const char **operand) { - return parseRequiredParameter(tune, &tune->percentage, operand); +parsePercentage (TuneBuilder *tb, const wchar_t **operand) { + return parseRequiredParameter(tb, &tb->percentage, operand); } static int -parseTempo (TuneBuilder *tune, const char **operand) { - return parseRequiredParameter(tune, &tune->tempo, operand); +parseTempo (TuneBuilder *tb, const wchar_t **operand) { + return parseRequiredParameter(tb, &tb->tempo, operand); } static void -setCurrentDuration (TuneBuilder *tune, TuneNumber multiplier, TuneNumber divisor) { - tune->duration.current = (60000 * multiplier) / (tune->tempo.current * divisor); +setCurrentDuration (TuneBuilder *tb, TuneNumber multiplier, TuneNumber divisor) { + tb->duration.current = (60000 * multiplier) / (tb->tempo.current * divisor); } static void -setBaseDuration (TuneBuilder *tune) { - setCurrentDuration(tune, 1, 1); +setBaseDuration (TuneBuilder *tb) { + setCurrentDuration(tb, 1, 1); } static int -parseDuration (TuneBuilder *tune, const char **operand, int *duration) { +parseDuration (TuneBuilder *tb, const wchar_t **operand, int *duration) { if (**operand == '@') { *operand += 1; - TuneParameter parameter = tune->duration; - if (!parseRequiredParameter(tune, ¶meter, operand)) return 0; + TuneParameter parameter = tb->duration; + if (!parseRequiredParameter(tb, ¶meter, operand)) return 0; *duration = parameter.current; } else { - const char *durationOperand = *operand; + const wchar_t *durationOperand = *operand; TuneNumber multiplier; TuneNumber divisor; @@ -183,7 +216,7 @@ parseDuration (TuneBuilder *tune, const char **operand, int *duration) { if (**operand == '*') { *operand += 1; - if (!parseNumber(tune, &multiplier, operand, 1, 1, 16, "duration multiplier")) { + if (!parseNumber(tb, &multiplier, operand, 1, 1, 16, "duration multiplier")) { return 0; } } else { @@ -193,18 +226,18 @@ parseDuration (TuneBuilder *tune, const char **operand, int *duration) { if (**operand == '/') { *operand += 1; - if (!parseNumber(tune, &divisor, operand, 1, 1, 128, "duration divisor")) { + if (!parseNumber(tb, &divisor, operand, 1, 1, 128, "duration divisor")) { return 0; } } else { divisor = 1; } - if (*operand != durationOperand) setCurrentDuration(tune, multiplier, divisor); - *duration = tune->duration.current; + if (*operand != durationOperand) setCurrentDuration(tb, multiplier, divisor); + *duration = tb->duration.current; } - tune->duration.current = *duration; + tb->duration.current = *duration; { int increment = *duration; @@ -224,31 +257,31 @@ toOctave (TuneNumber note) { } static void -setOctave (TuneBuilder *tune) { - tune->octave.current = toOctave(tune->note.current); +setOctave (TuneBuilder *tb) { + tb->octave.current = toOctave(tb->note.current); } static void -setAccidentals (TuneBuilder *tune, int accidentals) { +setAccidentals (TuneBuilder *tb, int accidentals) { int quotient = accidentals / NOTES_PER_SCALE; int remainder = accidentals % NOTES_PER_SCALE; - for (unsigned int index=0; indexaccidentals); index+=1) { - tune->accidentals[index] = quotient; + for (unsigned int index=0; indexaccidentals); index+=1) { + tb->accidentals[index] = quotient; } while (remainder > 0) { - tune->accidentals[accidentalTable[--remainder]] += 1; + tb->accidentals[accidentalTable[--remainder]] += 1; } while (remainder < 0) { - tune->accidentals[accidentalTable[NOTES_PER_SCALE + remainder++]] -= 1; + tb->accidentals[accidentalTable[NOTES_PER_SCALE + remainder++]] -= 1; } } static int -parseNoteLetter (unsigned char *index, const char **operand) { - const char *letter = strchr(noteLetters, **operand); +parseNoteLetter (unsigned char *index, const wchar_t **operand) { + const wchar_t *letter = wcschr(noteLetters, **operand); if (!letter) return 0; if (!*letter) return 0; @@ -259,11 +292,11 @@ parseNoteLetter (unsigned char *index, const char **operand) { } static int -parseMode (TuneBuilder *tune, int *accidentals, const char **operand) { - const char *from = *operand; +parseMode (TuneBuilder *tb, int *accidentals, const wchar_t **operand) { + const wchar_t *from = *operand; if (!isalpha(*from)) return 1; - const char *to = from; + const wchar_t *to = from; while (isalpha(*++to)); unsigned int length = to - from; @@ -272,9 +305,9 @@ parseMode (TuneBuilder *tune, int *accidentals, const char **operand) { const ModeEntry *end = current + modeCount; while (current < end) { - if (strncmp(current->name, from, length) == 0) { + if (wcsncmp(current->name, from, length) == 0) { if (mode) { - logSyntaxError(tune, "ambiguous mode"); + logSyntaxError(tb, "ambiguous mode"); return 0; } @@ -285,7 +318,7 @@ parseMode (TuneBuilder *tune, int *accidentals, const char **operand) { } if (!mode) { - logSyntaxError(tune, "unrecognized mode"); + logSyntaxError(tb, "unrecognized mode"); return 0; } @@ -295,7 +328,7 @@ parseMode (TuneBuilder *tune, int *accidentals, const char **operand) { } static int -parseKeySignature (TuneBuilder *tune, const char **operand) { +parseKeySignature (TuneBuilder *tb, const wchar_t **operand) { int accidentals; int increment; @@ -305,7 +338,7 @@ parseKeySignature (TuneBuilder *tune, const char **operand) { if (parseNoteLetter(&index, operand)) { accidentals = scaleAccidentals[index]; increment = NOTES_PER_SCALE; - if (!parseMode(tune, &accidentals, operand)) return 0; + if (!parseMode(tb, &accidentals, operand)) return 0; } else { accidentals = 0; increment = 1; @@ -313,12 +346,12 @@ parseKeySignature (TuneBuilder *tune, const char **operand) { } TuneNumber count = 0; - if (!parseNumber(tune, &count, operand, 0, 1, NOTES_PER_OCTAVE-1, "accidental count")) { + if (!parseNumber(tb, &count, operand, 0, 1, NOTES_PER_OCTAVE-1, "accidental count")) { return 0; } int haveCount = count != 0; - char accidental = **operand; + wchar_t accidental = **operand; switch (accidental) { case '-': @@ -335,17 +368,17 @@ parseKeySignature (TuneBuilder *tune, const char **operand) { default: if (!haveCount) break; - logSyntaxError(tune, "accidental not specified"); + logSyntaxError(tb, "accidental not specified"); return 0; } accidentals += increment * count; - setAccidentals(tune, accidentals); + setAccidentals(tb, accidentals); return 1; } static int -parseNote (TuneBuilder *tune, const char **operand, unsigned char *note) { +parseNote (TuneBuilder *tb, const wchar_t **operand, unsigned char *note) { int noteNumber; if (**operand == 'r') { @@ -356,23 +389,23 @@ parseNote (TuneBuilder *tune, const char **operand, unsigned char *note) { if (**operand == 'n') { *operand += 1; - TuneParameter parameter = tune->note; - if (!parseRequiredParameter(tune, ¶meter, operand)) return 0; + TuneParameter parameter = tb->note; + if (!parseRequiredParameter(tb, ¶meter, operand)) return 0; noteNumber = parameter.current; } else { unsigned char noteIndex; if (!parseNoteLetter(¬eIndex, operand)) return 0; - const char *octaveOperand = *operand; - TuneParameter octave = tune->octave; - if (!parseOptionalParameter(tune, &octave, operand)) return 0; + const wchar_t *octaveOperand = *operand; + TuneParameter octave = tb->octave; + if (!parseOptionalParameter(tb, &octave, operand)) return 0; noteNumber = (octave.current * NOTES_PER_OCTAVE) + noteOffsets[noteIndex]; - defaultAccidentals = tune->accidentals[noteIndex]; + defaultAccidentals = tb->accidentals[noteIndex]; if (*operand == octaveOperand) { int adjustOctave = 0; - TuneNumber previousNote = tune->note.current; + TuneNumber previousNote = tb->note.current; TuneNumber currentNote = noteNumber; if (currentNote < previousNote) { @@ -387,11 +420,11 @@ parseNote (TuneBuilder *tune, const char **operand, unsigned char *note) { } } - tune->note.current = noteNumber; - setOctave(tune); + tb->note.current = noteNumber; + setOctave(tb); { - char accidental = **operand; + wchar_t accidental = **operand; switch (accidental) { { @@ -428,12 +461,12 @@ parseNote (TuneBuilder *tune, const char **operand, unsigned char *note) { const unsigned char highestNote = getHighestNote(); if (noteNumber < lowestNote) { - logSyntaxError(tune, "note too low"); + logSyntaxError(tb, "note too low"); return 0; } if (noteNumber > highestNote) { - logSyntaxError(tune, "note too high"); + logSyntaxError(tb, "note too high"); return 0; } } @@ -444,59 +477,59 @@ parseNote (TuneBuilder *tune, const char **operand, unsigned char *note) { } static int -parseTone (TuneBuilder *tune, const char **operand) { +parseTone (TuneBuilder *tb, const wchar_t **operand) { while (1) { - tune->source.text = *operand; + tb->source.text = *operand; unsigned char note; { - const char *noteOperand = *operand; - if (!parseNote(tune, operand, ¬e)) return *operand == noteOperand; + const wchar_t *noteOperand = *operand; + if (!parseNote(tb, operand, ¬e)) return *operand == noteOperand; } int duration; - if (!parseDuration(tune, operand, &duration)) return 0; + if (!parseDuration(tb, operand, &duration)) return 0; if (note) { - int onDuration = (duration * tune->percentage.current) / 100; - if (!addNote(tune, note, onDuration)) return 0; + int onDuration = (duration * tb->percentage.current) / 100; + if (!addNote(tb, note, onDuration)) return 0; duration -= onDuration; } - if (!addNote(tune, 0, duration)) return 0; + if (!addNote(tb, 0, duration)) return 0; } return 1; } static int -parseTuneOperand (TuneBuilder *tune, const char *operand) { - tune->source.text = operand; +parseTuneOperand (TuneBuilder *tb, const wchar_t *operand) { + tb->source.text = operand; switch (*operand) { case 'k': operand += 1; - if (!parseKeySignature(tune, &operand)) return 0; + if (!parseKeySignature(tb, &operand)) return 0; break; case 'p': operand += 1; - if (!parsePercentage(tune, &operand)) return 0; + if (!parsePercentage(tb, &operand)) return 0; break; case 't': operand += 1; - if (!parseTempo(tune, &operand)) return 0; - setBaseDuration(tune); + if (!parseTempo(tb, &operand)) return 0; + setBaseDuration(tb); break; default: - if (!parseTone(tune, &operand)) return 0; + if (!parseTone(tb, &operand)) return 0; break; } if (*operand) { - logSyntaxError(tune, "extra data"); + logSyntaxError(tb, "extra data"); return 0; } @@ -504,19 +537,27 @@ parseTuneOperand (TuneBuilder *tune, const char *operand) { } int -parseTuneLine (TuneBuilder *tune, const char *line) { - tune->source.text = line; +parseTuneText (TuneBuilder *tb, const wchar_t *text) { + tb->source.text = text; + + wchar_t buffer[wcslen(text) + 1]; + wcscpy(buffer, text); - char buffer[strlen(line) + 1]; - strcpy(buffer, line); + static const wchar_t *delimiters = WS_C(" \t\r\n"); + wchar_t *string = buffer; + wchar_t *operand; - static const char delimiters[] = " \t\r\n"; - char *string = buffer; - char *operand; +#if !defined(__MINGW32__) && !defined(__MSDOS__) + wchar_t *next; +#endif /* __MINGW32__ */ - while ((operand = strtok(string, delimiters))) { + while ((operand = wcstok(string, delimiters +#ifndef __MINGW32__ + , &next +#endif /* __MINGW32__ */ + ))) { if (*operand == '#') break; - if (!parseTuneOperand(tune, operand)) return 0; + if (!parseTuneOperand(tb, operand)) return 0; string = NULL; } @@ -524,9 +565,57 @@ parseTuneLine (TuneBuilder *tune, const char *line) { } int -endTune (TuneBuilder *tune) { - ToneElement tone = TONE_STOP(); - return addTone(tune, &tone); +parseTuneString (TuneBuilder *tb, const char *string) { + const size_t size = strlen(string) + 1; + wchar_t characters[size]; + + const char *byte = string; + wchar_t *character = characters; + + convertUtf8ToWchars(&byte, &character, size); + + return parseTuneText(tb, characters); +} + +ToneElement * +getTune (TuneBuilder *tb) { + if (tb->status == TUNE_STATUS_OK) { + unsigned int count = tb->tones.count; + ToneElement *tune; + + if ((tune = malloc(ARRAY_SIZE(tune, (count + 1))))) { + memcpy(tune, tb->tones.array, ARRAY_SIZE(tune, count)); + + static const ToneElement tone = TONE_STOP(); + tune[count] = tone; + + return tune; + } else { + logMallocError(); + } + } + + return NULL; +} + +TuneStatus +getTuneStatus (TuneBuilder *tb) { + return tb->status; +} + +void +setTuneSourceName (TuneBuilder *tb, const char *name) { + tb->source.name = name; +} + +void +setTuneSourceIndex (TuneBuilder *tb, unsigned int index) { + tb->source.index = index; +} + +void +incrementTuneSourceIndex (TuneBuilder *tb) { + tb->source.index += 1; } static inline void @@ -541,31 +630,47 @@ setParameter ( } void -initializeTuneBuilder (TuneBuilder *tune) { - memset(tune, 0, sizeof(*tune)); - tune->status = TUNE_BUILD_OK; +resetTuneBuilder (TuneBuilder *tb) { + tb->status = TUNE_STATUS_OK; + + tb->tones.count = 0; + + setParameter(&tb->duration, "note duration", 1, UINT16_MAX, 0); + setParameter(&tb->note, "MIDI note number", getLowestNote(), getHighestNote(), NOTE_MIDDLE_C+noteOffsets[2]); + setParameter(&tb->octave, "octave number", 0, 10, 0); + setParameter(&tb->percentage, "percentage", 1, 100, 80); + setParameter(&tb->tempo, "tempo", 40, UINT8_MAX, (60 * 2)); - tune->tones.array = NULL; - tune->tones.size = 0; - tune->tones.count = 0; + setAccidentals(tb, 0); + setBaseDuration(tb); + setOctave(tb); + + tb->source.text = WS_C(""); + tb->source.name = ""; + tb->source.index = 0; +} - setParameter(&tune->duration, "note duration", 1, UINT16_MAX, 0); - setParameter(&tune->note, "MIDI note number", getLowestNote(), getHighestNote(), NOTE_MIDDLE_C+noteOffsets[2]); - setParameter(&tune->octave, "octave number", 0, 10, 0); - setParameter(&tune->percentage, "percentage", 1, 100, 80); - setParameter(&tune->tempo, "tempo", 40, UINT8_MAX, (60 * 2)); +TuneBuilder * +newTuneBuilder (void) { + TuneBuilder *tb; - setAccidentals(tune, 0); - setBaseDuration(tune); - setOctave(tune); + if ((tb = malloc(sizeof(*tb)))) { + memset(tb, 0, sizeof(*tb)); + + tb->tones.array = NULL; + tb->tones.size = 0; + + resetTuneBuilder(tb); + return tb; + } else { + logMallocError(); + } - tune->source.text = ""; - tune->source.name = ""; - tune->source.index = 0; + return NULL; } void -resetTuneBuilder (TuneBuilder *tune) { - if (tune->tones.array) free(tune->tones.array); - initializeTuneBuilder(tune); +destroyTuneBuilder (TuneBuilder *tb) { + if (tb->tones.array) free(tb->tones.array); + free(tb); } diff --git a/Programs/tune_utils.c b/Programs/tune_utils.c index 4c4b83e279595e6d81f8400d38cab2d949f38e29..4597f33af35e72107732b91a52a7c27a89479311 100644 --- a/Programs/tune_utils.c +++ b/Programs/tune_utils.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/unicode.c b/Programs/unicode.c index c50da35cae353bb45585e71a3dd3ff8fe91404d1..e353bf8420eb8941ae27b15a1bd8aa4aff070b87 100644 --- a/Programs/unicode.c +++ b/Programs/unicode.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/update.c b/Programs/update.c index e6c1f57e2151d386b734aae1e2719ba72f710c05..b47738f0b3d2f06309dcfc5841311d1f91671bf4 100644 --- a/Programs/update.c +++ b/Programs/update.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -124,16 +124,23 @@ getScreenCursorPosition (int x, int y) { if (isContracted) { int uncontractedOffset = getUncontractedCursorOffset(x, y); - if (uncontractedOffset < contractedLength) { - while (uncontractedOffset >= 0) { - int contractedOffset = contractedOffsets[uncontractedOffset]; + if (uncontractedOffset != BRL_NO_CURSOR) { + if (uncontractedOffset < contractedLength) { + const unsigned int windowLength = brl.textColumns * brl.textRows; - if (contractedOffset != CTB_NO_OFFSET) { - position = ((contractedOffset / textCount) * brl.textColumns) + textStart + (contractedOffset % textCount); - break; - } + while (uncontractedOffset >= 0) { + int contractedOffset = contractedOffsets[uncontractedOffset]; - uncontractedOffset -= 1; + if (contractedOffset != CTB_NO_OFFSET) { + int offset = ((contractedOffset / textCount) * brl.textColumns) + + textStart + (contractedOffset % textCount); + + if (offset < windowLength) position = offset; + break; + } + + uncontractedOffset -= 1; + } } } } else @@ -142,8 +149,10 @@ getScreenCursorPosition (int x, int y) { { if ((x >= ses->winx) && (x < (int)(ses->winx + textCount)) && (y >= ses->winy) && (y < (int)(ses->winy + brl.textRows)) && - (x < scr.cols) && (y < scr.rows)) - position = ((y - ses->winy) * brl.textColumns) + textStart + x - ses->winx; + (x < scr.cols) && (y < scr.rows)) { + position = ((y - ses->winy) * brl.textColumns) + + textStart + (x - ses->winx); + } } return position; diff --git a/Programs/update.h b/Programs/update.h index 1580bbbf67cb70355c45f50570ff3bc07f29a578..32e6cd3f7fd7fa470a8ae2266bfd69307cf8242d 100644 --- a/Programs/update.h +++ b/Programs/update.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb.c b/Programs/usb.c index b5d2ed97aea070119ae0e0fbdeff4d0dd34a04e2..befadb46aff1798bd40a31546d7cbed1706dff84 100644 --- a/Programs/usb.c +++ b/Programs/usb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -37,6 +37,7 @@ #include "device.h" #include "timing.h" #include "async_wait.h" +#include "async_alarm.h" #include "io_misc.h" #include "io_usb.h" #include "usb_internal.h" @@ -487,14 +488,17 @@ usbNextDescriptor ( const UsbDescriptor *next = (UsbDescriptor *)&(*descriptor)->bytes[(*descriptor)->header.bLength]; const UsbDescriptor *first = (UsbDescriptor *)device->configuration; unsigned int length = getLittleEndian16(first->configuration.wTotalLength); + if ((&next->bytes[0] - &first->bytes[0]) >= length) return 0; if ((&next->bytes[next->header.bLength] - &first->bytes[0]) > length) return 0; + *descriptor = next; } else if (usbConfigurationDescriptor(device)) { *descriptor = (UsbDescriptor *)device->configuration; } else { return 0; } + return 1; } @@ -507,10 +511,13 @@ usbInterfaceDescriptor ( const UsbDescriptor *descriptor = NULL; while (usbNextDescriptor(device, &descriptor)) { - if (descriptor->interface.bDescriptorType == UsbDescriptorType_Interface) - if (descriptor->interface.bInterfaceNumber == interface) - if (descriptor->interface.bAlternateSetting == alternative) + if (descriptor->interface.bDescriptorType == UsbDescriptorType_Interface) { + if (descriptor->interface.bInterfaceNumber == interface) { + if (descriptor->interface.bAlternateSetting == alternative) { return &descriptor->interface; + } + } + } } logMessage(LOG_WARNING, "USB: interface descriptor not found: %d.%d", interface, alternative); @@ -527,9 +534,11 @@ usbAlternativeCount ( const UsbDescriptor *descriptor = NULL; while (usbNextDescriptor(device, &descriptor)) { - if (descriptor->interface.bDescriptorType == UsbDescriptorType_Interface) - if (descriptor->interface.bInterfaceNumber == interface) + if (descriptor->interface.bDescriptorType == UsbDescriptorType_Interface) { + if (descriptor->interface.bInterfaceNumber == interface) { count += 1; + } + } } return count; @@ -543,9 +552,11 @@ usbEndpointDescriptor ( const UsbDescriptor *descriptor = NULL; while (usbNextDescriptor(device, &descriptor)) { - if (descriptor->endpoint.bDescriptorType == UsbDescriptorType_Endpoint) - if (descriptor->endpoint.bEndpointAddress == endpointAddress) + if (descriptor->endpoint.bDescriptorType == UsbDescriptorType_Endpoint) { + if (descriptor->endpoint.bEndpointAddress == endpointAddress) { return &descriptor->endpoint; + } + } } logMessage(LOG_WARNING, "USB: endpoint descriptor not found: %02X", endpointAddress); @@ -572,13 +583,30 @@ usbHaveInputError (UsbEndpoint *endpoint) { } void -usbSetInputError (UsbEndpoint *endpoint, int error) { +usbSetEndpointInputError (UsbEndpoint *endpoint, int error) { if (!usbHaveInputError(endpoint)) { endpoint->direction.input.pipe.error = error; closeFile(&endpoint->direction.input.pipe.input); } } +static int +usbSetInputError (void *item, void *data) { + UsbEndpoint *endpoint = item; + const int *error = data; + + if (usbHaveInputPipe(endpoint)) { + usbSetEndpointInputError(endpoint, *error); + } + + return 0; +} + +void +usbSetDeviceInputError (UsbDevice *device, int error) { + processQueue(device->endpoints, usbSetInputError, &error); +} + int usbEnqueueInput (UsbEndpoint *endpoint, const void *buffer, size_t length) { if (usbHaveInputError(endpoint)) { @@ -640,9 +668,14 @@ usbDeallocateEndpoint (void *item, void *data) { switch (USB_ENDPOINT_DIRECTION(endpoint->descriptor)) { case UsbEndpointDirection_Input: - if (endpoint->direction.input.pending) { - deallocateQueue(endpoint->direction.input.pending); - endpoint->direction.input.pending = NULL; + if (endpoint->direction.input.pending.alarm) { + asyncCancelRequest(endpoint->direction.input.pending.alarm); + endpoint->direction.input.pending.alarm = NULL; + } + + if (endpoint->direction.input.pending.requests) { + deallocateQueue(endpoint->direction.input.pending.requests); + endpoint->direction.input.pending.requests = NULL; } if (endpoint->direction.input.completed.request) { @@ -693,13 +726,13 @@ usbGetEndpoint (UsbDevice *device, unsigned char endpointAddress) { const char *transfer; switch (USB_ENDPOINT_DIRECTION(descriptor)) { - default: direction = "?"; break; + default: direction = "?"; break; case UsbEndpointDirection_Input: direction = "in"; break; case UsbEndpointDirection_Output: direction = "out"; break; } switch (USB_ENDPOINT_TRANSFER(descriptor)) { - default: transfer = "?"; break; + default: transfer = "?"; break; case UsbEndpointTransfer_Control: transfer = "ctl"; break; case UsbEndpointTransfer_Isochronous: transfer = "iso"; break; case UsbEndpointTransfer_Bulk: transfer = "blk"; break; @@ -721,7 +754,9 @@ usbGetEndpoint (UsbDevice *device, unsigned char endpointAddress) { switch (USB_ENDPOINT_DIRECTION(endpoint->descriptor)) { case UsbEndpointDirection_Input: - endpoint->direction.input.pending = NULL; + endpoint->direction.input.pending.requests = NULL; + endpoint->direction.input.pending.alarm = NULL; + endpoint->direction.input.pending.delay = 0; endpoint->direction.input.completed.request = NULL; endpoint->direction.input.completed.buffer = NULL; @@ -774,7 +809,9 @@ usbFinishEndpoint (void *item, void *data) { switch (USB_ENDPOINT_DIRECTION(endpoint->descriptor)) { case UsbEndpointDirection_Input: - if (endpoint->direction.input.pending) deleteElements(endpoint->direction.input.pending); + if (endpoint->direction.input.pending.requests) { + deleteElements(endpoint->direction.input.pending.requests); + } break; default: @@ -828,21 +865,28 @@ usbApplyInputFilter (void *item, void *data) { int usbApplyInputFilters (UsbEndpoint *endpoint, void *buffer, size_t size, ssize_t *length) { - UsbInputFilterData data = { - .buffer = buffer, - .size = size, - .length = *length - }; + Queue *filters = endpoint->device->inputFilters; - usbLogEndpointData(endpoint, "unfiltered input", buffer, *length); + if (getQueueSize(filters) == 0) { + usbLogEndpointData(endpoint, "input", buffer, *length); + } else { + usbLogEndpointData(endpoint, "unfiltered input", buffer, *length); - if (processQueue(endpoint->device->inputFilters, usbApplyInputFilter, &data)) { - errno = EIO; - return 0; + UsbInputFilterData data = { + .buffer = buffer, + .size = size, + .length = *length + }; + + if (processQueue(filters, usbApplyInputFilter, &data)) { + errno = EIO; + return 0; + } + + *length = data.length; + usbLogEndpointData(endpoint, "filtered input", buffer, *length); } - *length = data.length; - usbLogEndpointData(endpoint, "filtered input", buffer, *length); return 1; } @@ -902,6 +946,11 @@ done: void usbCloseDevice (UsbDevice *device) { + if (device->serial.operations) { + const UsbSerialOperations *uso = device->serial.operations; + if (uso->disableAdapter) uso->disableAdapter(device); + } + usbCloseInterface(device); usbRemoveEndpoints(device, 1); @@ -980,6 +1029,12 @@ usbTestDevice (UsbDeviceExtension *extension, UsbDeviceChooser *chooser, UsbChoo return NULL; } +void +usbLogInputProblem (UsbEndpoint *endpoint, const char *problem) { + logMessage(LOG_WARNING, "USB input: %s: Ept:%02X", + problem, endpoint->descriptor->bEndpointAddress); +} + static void usbDeallocatePendingInputRequest (void *item, void *data) { void *request = item; @@ -987,10 +1042,8 @@ usbDeallocatePendingInputRequest (void *item, void *data) { usbCancelRequest(endpoint->device, request); } -Element * -usbAddPendingInputRequest ( - UsbEndpoint *endpoint -) { +static Element * +usbAddPendingInputRequest (UsbEndpoint *endpoint) { void *request = usbSubmitRequest(endpoint->device, endpoint->descriptor->bEndpointAddress, NULL, @@ -998,7 +1051,7 @@ usbAddPendingInputRequest ( endpoint); if (request) { - Element *element = enqueueItem(endpoint->direction.input.pending, request); + Element *element = enqueueItem(endpoint->direction.input.pending.requests, request); if (element) return element; usbCancelRequest(endpoint->device, request); @@ -1007,6 +1060,64 @@ usbAddPendingInputRequest ( return NULL; } +static void +usbEnsurePendingInputRequests (UsbEndpoint *endpoint, int count) { + int limit = USB_INPUT_INTERRUPT_REQUESTS_MAXIMUM; + if ((count < 1) || (count > limit)) count = limit; + endpoint->direction.input.pending.delay = 0; + + while (getQueueSize(endpoint->direction.input.pending.requests) < count) { + if (!usbAddPendingInputRequest(endpoint)) { + break; + } + } +} + +ASYNC_ALARM_CALLBACK(usbHandleSchedulePendingInputRequest) { + UsbEndpoint *endpoint = parameters->data; + + asyncDiscardHandle(endpoint->direction.input.pending.alarm); + endpoint->direction.input.pending.alarm = NULL; + + usbAddPendingInputRequest(endpoint); +} + +static void +usbSchedulePendingInputRequest (UsbEndpoint *endpoint) { + if (!endpoint->direction.input.pending.alarm) { + int *delay = &endpoint->direction.input.pending.delay; + + if (!*delay) *delay = 1; + *delay = MIN(*delay, USB_INPUT_INTERRUPT_DELAY_MAXIMUM); + + asyncSetAlarmIn(&endpoint->direction.input.pending.alarm, *delay, + usbHandleSchedulePendingInputRequest, endpoint); + + *delay += 1; + } +} + +int +usbHandleInputResponse (UsbEndpoint *endpoint, const void *buffer, size_t length) { + int requestsLeft = getQueueSize(endpoint->direction.input.pending.requests); + + if (length > 0) { + if (!usbEnqueueInput(endpoint, buffer, length)) { + usbLogInputProblem(endpoint, "data not enqueued"); + return 0; + } + + usbEnsurePendingInputRequests(endpoint, requestsLeft+2); + return 1; + } + + if (requestsLeft == 0) { + usbSchedulePendingInputRequest(endpoint); + } + + return 1; +} + void usbBeginInput ( UsbDevice *device, @@ -1015,20 +1126,14 @@ usbBeginInput ( UsbEndpoint *endpoint = usbGetInputEndpoint(device, endpointNumber); if (endpoint) { - if (!endpoint->direction.input.pending) { - if ((endpoint->direction.input.pending = newQueue(usbDeallocatePendingInputRequest, NULL))) { - setQueueData(endpoint->direction.input.pending, endpoint); + if (!endpoint->direction.input.pending.requests) { + if ((endpoint->direction.input.pending.requests = newQueue(usbDeallocatePendingInputRequest, NULL))) { + setQueueData(endpoint->direction.input.pending.requests, endpoint); } } - if (endpoint->direction.input.pending) { - const int count = USB_INPUT_INTERRUPT_URB_COUNT; - - while (getQueueSize(endpoint->direction.input.pending) < count) { - if (!usbAddPendingInputRequest(endpoint)) { - break; - } - } + if (endpoint->direction.input.pending.requests) { + usbEnsurePendingInputRequests(endpoint, 0); } } } @@ -1067,7 +1172,7 @@ usbAwaitInput ( retryInterval = endpoint->descriptor->bInterval; retryInterval = MAX(USB_INPUT_AWAIT_RETRY_INTERVAL_MINIMUM, retryInterval); - if (!(endpoint->direction.input.pending && getQueueSize(endpoint->direction.input.pending))) { + if (!(endpoint->direction.input.pending.requests && getQueueSize(endpoint->direction.input.pending.requests))) { int size = getLittleEndian16(endpoint->descriptor->wMaxPacketSize); unsigned char *buffer = malloc(size); @@ -1123,7 +1228,7 @@ usbAwaitInput ( } usbAddPendingInputRequest(endpoint); - deleteItem(endpoint->direction.input.pending, request); + deleteItem(endpoint->direction.input.pending.requests, request); if (response.count > 0) { endpoint->direction.input.completed.request = request; diff --git a/Programs/usb_adapters.c b/Programs/usb_adapters.c index 60c98591c53761567767b1f61384e9b765fb1098..b3d881e23efb7c20fa84015fc5f171f9b294b757 100644 --- a/Programs/usb_adapters.c +++ b/Programs/usb_adapters.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_adapters.h b/Programs/usb_adapters.h index e865973337d3a46ac0f22e6ea6e74d986f394f8f..e0418e5828c41f6666a522fc6c2a6e331e7fb506 100644 --- a/Programs/usb_adapters.h +++ b/Programs/usb_adapters.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_android.c b/Programs/usb_android.c index d936c6e3ad336c9676a15f0de33271af1cf1d4c4..7cdbc39c01ed32f74b3d4bc5625fcf5e4d4c0d40 100644 --- a/Programs/usb_android.c +++ b/Programs/usb_android.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_belkin.c b/Programs/usb_belkin.c index 947a3c88d1aa2f00974a2ae4609d2b0737064a99..c3841988ff31e1adae4ff03d5d71f48845b1f768 100644 --- a/Programs/usb_belkin.c +++ b/Programs/usb_belkin.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_belkin.h b/Programs/usb_belkin.h index 2fbec5006572830090ec30ebb67d4686de198393..f537d3f3524949ec88c02d7fe6cdcffadc462515 100644 --- a/Programs/usb_belkin.h +++ b/Programs/usb_belkin.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_bsd.h b/Programs/usb_bsd.h index 7166b10d8d4a3ebd9992c76edc46161832d31517..d53f41b9d0ff63dd8efd1a5315f73629f205915f 100644 --- a/Programs/usb_bsd.h +++ b/Programs/usb_bsd.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_cdc_acm.c b/Programs/usb_cdc_acm.c index 907cc5a6e87aa8d78b5c40d95721b401ba9ef71e..fe399957f2c48625ae2ff3629cd099fc289c9da3 100644 --- a/Programs/usb_cdc_acm.c +++ b/Programs/usb_cdc_acm.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -22,6 +22,7 @@ #include #include "log.h" +#include "strfmt.h" #include "usb_serial.h" #include "usb_cdc_acm.h" #include "usb_internal.h" @@ -31,82 +32,97 @@ struct UsbSerialDataStruct { UsbDevice *device; const UsbInterfaceDescriptor *interface; const UsbEndpointDescriptor *endpoint; -}; -static const UsbInterfaceDescriptor * -usbFindCommunicationInterface (UsbDevice *device) { - const UsbDescriptor *descriptor = NULL; + USB_CDC_ACM_LineCoding lineCoding; +}; - while (usbNextDescriptor(device, &descriptor)) { - if (descriptor->header.bDescriptorType == UsbDescriptorType_Interface) { - if (descriptor->interface.bInterfaceClass == 0X02) { - return &descriptor->interface; - } - } - } +static int +usbGetParameters_CDC_ACM (UsbDevice *device, uint8_t request, uint16_t value, void *data, uint16_t size) { + ssize_t result = usbControlRead(device, UsbControlRecipient_Interface, + UsbControlType_Class, request, value, + device->serial.data->interface->bInterfaceNumber, + data, size, 1000); - logMessage(LOG_WARNING, "USB: communication interface descriptor not found"); - errno = ENOENT; - return NULL; + return result != -1; } -static const UsbEndpointDescriptor * -usbFindInterruptInputEndpoint (UsbDevice *device, const UsbInterfaceDescriptor *interface) { - const UsbDescriptor *descriptor = (const UsbDescriptor *)interface; +static int +usbGetParameter_CDC_ACM (UsbDevice *device, uint8_t request, void *data, uint16_t size) { + return usbGetParameters_CDC_ACM(device, request, 0, data, size); +} - while (usbNextDescriptor(device, &descriptor)) { - if (descriptor->header.bDescriptorType == UsbDescriptorType_Interface) break; +static int +usbSetParameters_CDC_ACM (UsbDevice *device, uint8_t request, uint16_t value, const void *data, uint16_t size) { + ssize_t result = usbControlWrite(device, UsbControlRecipient_Interface, + UsbControlType_Class, request, value, + device->serial.data->interface->bInterfaceNumber, + data, size, 1000); - if (descriptor->header.bDescriptorType == UsbDescriptorType_Endpoint) { - if (USB_ENDPOINT_DIRECTION(&descriptor->endpoint) == UsbEndpointDirection_Input) { - if (USB_ENDPOINT_TRANSFER(&descriptor->endpoint) == UsbEndpointTransfer_Interrupt) { - return &descriptor->endpoint; - } - } - } - } + return result != -1; +} - logMessage(LOG_WARNING, "USB: interrupt input endpoint descriptor not found"); - errno = ENOENT; - return NULL; +static int +usbSetParameter_CDC_ACM (UsbDevice *device, uint8_t request, uint16_t value) { + return usbSetParameters_CDC_ACM(device, request, value, NULL, 0); } static int -usbMakeData_CDC_ACM (UsbDevice *device, UsbSerialData **serialData) { - UsbSerialData *usd; +usbSetControlLines_CDC_ACM (UsbDevice *device, uint16_t lines) { + return usbSetParameter_CDC_ACM(device, USB_CDC_ACM_CTL_SetControlLineState, lines); +} - if ((usd = malloc(sizeof(*usd)))) { - memset(usd, 0, sizeof(*usd)); - usd->device = device; +static void +usbLogLineCoding_CDC_ACM (const USB_CDC_ACM_LineCoding *lineCoding) { + char log[0X80]; - if ((usd->interface = usbFindCommunicationInterface(device))) { - unsigned char interfaceNumber = usd->interface->bInterfaceNumber; + STR_BEGIN(log, sizeof(log)); + STR_PRINTF("CDC ACM line coding:"); - if (usbClaimInterface(device, interfaceNumber)) { - if (usbSetAlternative(device, usd->interface->bInterfaceNumber, usd->interface->bAlternateSetting)) { - if ((usd->endpoint = usbFindInterruptInputEndpoint(device, usd->interface))) { - usbBeginInput(device, USB_ENDPOINT_NUMBER(usd->endpoint)); - *serialData = usd; - return 1; - } - } + { // baud (bits per second) + uint32_t baud = getLittleEndian32(lineCoding->dwDTERate); + STR_PRINTF(" Baud:%" PRIu32, baud); + } - usbReleaseInterface(device, interfaceNumber); - } + { // number of data bits + STR_PRINTF(" Data:%u", lineCoding->bDataBits); + } + + { // number of stop bits + const char *bits; + +#define USB_CDC_ACM_STOP(value,name) \ +case USB_CDC_ACM_STOP_##value: bits = #name; break; + switch (lineCoding->bCharFormat) { + USB_CDC_ACM_STOP(1 , 1 ) + USB_CDC_ACM_STOP(1_5, 1.5) + USB_CDC_ACM_STOP(2 , 2 ) + default: bits = "?"; break; } +#undef USB_CDC_ACM_STOP - free(usd); - } else { - logMallocError(); + STR_PRINTF(" Stop:%s", bits); } - return 0; -} + { // type of parity + const char *parity; + +#define USB_CDC_ACM_PARITY(value,name) \ +case USB_CDC_ACM_PARITY_##value: parity = #name; break; + switch (lineCoding->bParityType) { + USB_CDC_ACM_PARITY(NONE , none ) + USB_CDC_ACM_PARITY(ODD , odd ) + USB_CDC_ACM_PARITY(EVEN , even ) + USB_CDC_ACM_PARITY(MARK , mark ) + USB_CDC_ACM_PARITY(SPACE, space) + default: parity = "?"; break; + } +#undef USB_CDC_ACM_PARITY -static void -usbDestroyData_CDC_ACM (UsbSerialData *usd) { - usbReleaseInterface(usd->device, usd->interface->bInterfaceNumber); - free(usd); + STR_PRINTF(" Parity:%s", parity); + } + + STR_END; + logMessage(LOG_CATEGORY(USB_IO), "%s", log); } static int @@ -178,14 +194,17 @@ usbSetLineProperties_CDC_ACM (UsbDevice *device, unsigned int baud, unsigned int } { - ssize_t result = usbControlWrite(device, - UsbControlRecipient_Interface, UsbControlType_Class, - USB_CDC_ACM_CTL_SetLineCoding, - 0, - device->serial.data->interface->bInterfaceNumber, - &lineCoding, sizeof(lineCoding), 1000); - - if (result == -1) return 0; + USB_CDC_ACM_LineCoding *oldCoding = &device->serial.data->lineCoding; + + if (memcmp(&lineCoding, oldCoding, sizeof(lineCoding)) != 0) { + if (!usbSetParameters_CDC_ACM(device, USB_CDC_ACM_CTL_SetLineCoding, 0, + &lineCoding, sizeof(lineCoding))) { + return 0; + } + + *oldCoding = lineCoding; + usbLogLineCoding_CDC_ACM(&lineCoding); + } } return 1; @@ -202,19 +221,108 @@ usbSetFlowControl_CDC_ACM (UsbDevice *device, SerialFlowControl flow) { return 1; } +static const UsbInterfaceDescriptor * +usbFindCommunicationInterface (UsbDevice *device) { + const UsbDescriptor *descriptor = NULL; + + while (usbNextDescriptor(device, &descriptor)) { + if (descriptor->header.bDescriptorType == UsbDescriptorType_Interface) { + if (descriptor->interface.bInterfaceClass == 0X02) { + return &descriptor->interface; + } + } + } + + logMessage(LOG_WARNING, "USB: communication interface descriptor not found"); + errno = ENOENT; + return NULL; +} + +static const UsbEndpointDescriptor * +usbFindInterruptInputEndpoint (UsbDevice *device, const UsbInterfaceDescriptor *interface) { + const UsbDescriptor *descriptor = (const UsbDescriptor *)interface; + + while (usbNextDescriptor(device, &descriptor)) { + if (descriptor->header.bDescriptorType == UsbDescriptorType_Interface) break; + + if (descriptor->header.bDescriptorType == UsbDescriptorType_Endpoint) { + if (USB_ENDPOINT_DIRECTION(&descriptor->endpoint) == UsbEndpointDirection_Input) { + if (USB_ENDPOINT_TRANSFER(&descriptor->endpoint) == UsbEndpointTransfer_Interrupt) { + return &descriptor->endpoint; + } + } + } + } + + logMessage(LOG_WARNING, "USB: interrupt input endpoint descriptor not found"); + errno = ENOENT; + return NULL; +} + static int -usbEnableAdapter_CDC_ACM (UsbDevice *device) { - ssize_t result = usbControlWrite(device, - UsbControlRecipient_Interface, UsbControlType_Class, - USB_CDC_ACM_CTL_SetControlLines, - USB_CDC_ACM_LINE_DTR, - device->serial.data->interface->bInterfaceNumber, - NULL, 0, 1000); +usbMakeData_CDC_ACM (UsbDevice *device, UsbSerialData **serialData) { + UsbSerialData *usd; + + if ((usd = malloc(sizeof(*usd)))) { + memset(usd, 0, sizeof(*usd)); + usd->device = device; + + if ((usd->interface = usbFindCommunicationInterface(device))) { + unsigned char interfaceNumber = usd->interface->bInterfaceNumber; + + if (usbClaimInterface(device, interfaceNumber)) { + if (usbSetAlternative(device, usd->interface->bInterfaceNumber, usd->interface->bAlternateSetting)) { + if ((usd->endpoint = usbFindInterruptInputEndpoint(device, usd->interface))) { + usbBeginInput(device, USB_ENDPOINT_NUMBER(usd->endpoint)); + *serialData = usd; + return 1; + } + } + + usbReleaseInterface(device, interfaceNumber); + } + } + + free(usd); + } else { + logMallocError(); + } - if (result != -1) return 1; return 0; } +static void +usbDestroyData_CDC_ACM (UsbSerialData *usd) { + usbReleaseInterface(usd->device, usd->interface->bInterfaceNumber); + free(usd); +} + +static int +usbEnableAdapter_CDC_ACM (UsbDevice *device) { + UsbSerialData *usd = device->serial.data; + + if (!usbSetControlLines_CDC_ACM(device, 0)) return 0; + if (!usbSetControlLines_CDC_ACM(device, USB_CDC_ACM_LINE_DTR)) return 0; + + { + USB_CDC_ACM_LineCoding *lineCoding = &usd->lineCoding; + + if (!usbGetParameter_CDC_ACM(device, USB_CDC_ACM_CTL_GetLineCoding, + lineCoding, sizeof(*lineCoding))) { + return 0; + } + + usbLogLineCoding_CDC_ACM(lineCoding); + } + + return 1; +} + +static void +usbDisableAdapter_CDC_ACM (UsbDevice *device) { + usbSetControlLines_CDC_ACM(device, 0); +} + const UsbSerialOperations usbSerialOperations_CDC_ACM = { .name = "CDC_ACM", @@ -223,5 +331,7 @@ const UsbSerialOperations usbSerialOperations_CDC_ACM = { .setLineProperties = usbSetLineProperties_CDC_ACM, .setFlowControl = usbSetFlowControl_CDC_ACM, - .enableAdapter = usbEnableAdapter_CDC_ACM + + .enableAdapter = usbEnableAdapter_CDC_ACM, + .disableAdapter = usbDisableAdapter_CDC_ACM }; diff --git a/Programs/usb_cdc_acm.h b/Programs/usb_cdc_acm.h index 485d083c194ef28b1727605c5c843acafc84beba..81fd9bcae65f17cc2b8f2fd0f9ec67456de950f5 100644 --- a/Programs/usb_cdc_acm.h +++ b/Programs/usb_cdc_acm.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -24,10 +24,13 @@ extern "C" { #endif /* __cplusplus */ typedef enum { - USB_CDC_ACM_CTL_SetLineCoding = 0X20, - USB_CDC_ACM_CTL_GetLineCoding = 0X21, - USB_CDC_ACM_CTL_SetControlLines = 0X22, - USB_CDC_ACM_CTL_SendBreak = 0X23 + USB_CDC_ACM_CTL_SetCommFeature = 0X02, + USB_CDC_ACM_CTL_GetCommFeature = 0X03, + USB_CDC_ACM_CTL_ClearCommFeature = 0X04, + USB_CDC_ACM_CTL_SetLineCoding = 0X20, + USB_CDC_ACM_CTL_GetLineCoding = 0X21, + USB_CDC_ACM_CTL_SetControlLineState = 0X22, + USB_CDC_ACM_CTL_SendBreak = 0X23 } USB_CDC_ACM_ControlRequest; typedef enum { diff --git a/Programs/usb_cp2101.c b/Programs/usb_cp2101.c index 87dfc9d88ff3f76445e56af021e02130ed2ce02e..2efe4ae71fa8268be07b3278915c3541768af5bc 100644 --- a/Programs/usb_cp2101.c +++ b/Programs/usb_cp2101.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_cp2101.h b/Programs/usb_cp2101.h index 989a8c4d4169ec420514387cf28461c478a17515..e823fba630864469f21d686e930417a695380544 100644 --- a/Programs/usb_cp2101.h +++ b/Programs/usb_cp2101.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_cp2110.c b/Programs/usb_cp2110.c index e5d52aee08c3f147eadd3e30569a4177eb01126c..d2b60b576cc8c3b258a1eb7dfe9956f4999b9602 100644 --- a/Programs/usb_cp2110.c +++ b/Programs/usb_cp2110.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_cp2110.h b/Programs/usb_cp2110.h index af3726e12517b172d751420ddb0a73972514d4fb..00612f419fd3f3625a7b31b2e95b5454f350d31e 100644 --- a/Programs/usb_cp2110.h +++ b/Programs/usb_cp2110.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_darwin.c b/Programs/usb_darwin.c index 500875d9a89fd8ea3b346f06ee7f0db0c1543948..2efeabed29aa52d747795c02139a28ede8356134 100644 --- a/Programs/usb_darwin.c +++ b/Programs/usb_darwin.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_freebsd.c b/Programs/usb_freebsd.c index 72e814f9dffc8a1700332f7ccf9e15360f545ca3..07c374b87c552bbdb248f37a6b5c44fb96f0101f 100644 --- a/Programs/usb_freebsd.c +++ b/Programs/usb_freebsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_ftdi.c b/Programs/usb_ftdi.c index 47b821c6a0902d81d99515f7e9f25507a0326da2..9aeefc0d06e1d1a35e3abf4eba3b855815438234 100644 --- a/Programs/usb_ftdi.c +++ b/Programs/usb_ftdi.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_ftdi.h b/Programs/usb_ftdi.h index 1e5dd39c818faae7cd6506166fedec7dbc24e1e4..d3f60e8330fbb3333fa74738de10eb23b357fbae 100644 --- a/Programs/usb_ftdi.h +++ b/Programs/usb_ftdi.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_grub.c b/Programs/usb_grub.c index 38b6bb09418188837ec6197bf2626a6c7afb3176..c4b250ec3192e84975083d27efcb9fb95411d89b 100644 --- a/Programs/usb_grub.c +++ b/Programs/usb_grub.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_hid.c b/Programs/usb_hid.c index 15c058be6030b1bbaad1e447c73b821855639948..80f51d574e62fd59b3ca7da6e380436a7fb59ae4 100644 --- a/Programs/usb_hid.c +++ b/Programs/usb_hid.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_internal.h b/Programs/usb_internal.h index 6e072690218b8db254072455dad23f22f674c5db..1fc354142e61298368a4fcc9010baea4829416df 100644 --- a/Programs/usb_internal.h +++ b/Programs/usb_internal.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -42,7 +42,11 @@ struct UsbEndpointStruct { union { struct { - Queue *pending; + struct { + Queue *requests; + AsyncHandle alarm; + int delay; + } pending; struct { void *request; @@ -89,9 +93,11 @@ extern UsbDevice *usbTestDevice ( extern UsbEndpoint *usbGetEndpoint (UsbDevice *device, unsigned char endpointAddress); extern UsbEndpoint *usbGetInputEndpoint (UsbDevice *device, unsigned char endpointNumber); extern UsbEndpoint *usbGetOutputEndpoint (UsbDevice *device, unsigned char endpointNumber); -extern Element *usbAddPendingInputRequest (UsbEndpoint *endpoint); extern int usbApplyInputFilters (UsbEndpoint *endpoint, void *buffer, size_t size, ssize_t *length); +extern void usbLogInputProblem (UsbEndpoint *endpoint, const char *problem); +extern int usbHandleInputResponse (UsbEndpoint *endpoint, const void *buffer, size_t length); + extern int usbSetSerialOperations (UsbDevice *device); extern int usbSetConfiguration (UsbDevice *device, unsigned char configuration); @@ -109,7 +115,9 @@ extern int usbSetAlternative ( extern int usbMakeInputPipe (UsbEndpoint *endpoint); extern void usbDestroyInputPipe (UsbEndpoint *endpoint); extern int usbEnqueueInput (UsbEndpoint *endpoint, const void *buffer, size_t length); -extern void usbSetInputError (UsbEndpoint *endpoint, int error); + +extern void usbSetEndpointInputError (UsbEndpoint *endpoint, int error); +extern void usbSetDeviceInputError (UsbDevice *device, int error); extern int usbMonitorInputPipe ( UsbDevice *device, unsigned char endpointNumber, diff --git a/Programs/usb_kfreebsd.c b/Programs/usb_kfreebsd.c index ae8f050f0daa981ca4c7463fa0d43349b1d57377..d66b7295489b60d9d2e713779333134f398a17b6 100644 --- a/Programs/usb_kfreebsd.c +++ b/Programs/usb_kfreebsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_libusb-1.0.c b/Programs/usb_libusb-1.0.c index b5dad8a5c4bc818afa47e42ffb59ef20e6292a3c..983efcd8fbb8be360bea2eec9829739ed67dd193 100644 --- a/Programs/usb_libusb-1.0.c +++ b/Programs/usb_libusb-1.0.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_libusb.c b/Programs/usb_libusb.c index 81198c7d7c185b06af864124238075220426dd20..ba48130a72d5f5b7119ec0414222a79321940dce 100644 --- a/Programs/usb_libusb.c +++ b/Programs/usb_libusb.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_linux.c b/Programs/usb_linux.c index 219ed2e13414e51eb91daa2f927b9ab8fcd9debb..0ae906d6bf9f7e007e5583fbbde4de0327075eae 100644 --- a/Programs/usb_linux.c +++ b/Programs/usb_linux.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -313,7 +313,7 @@ int usbClearHalt (UsbDevice *device, unsigned char endpointAddress) { UsbDeviceExtension *devx = device->extension; - logMessage(LOG_CATEGORY(USB_IO), "clearing endpoint: %02X", endpointAddress); + logMessage(LOG_CATEGORY(USB_IO), "clear halt: %02X", endpointAddress); if (usbOpenUsbfsFile(devx)) { unsigned int arg = endpointAddress; @@ -920,33 +920,16 @@ usbReadDeviceDescriptor (UsbDevice *device) { return 1; } -static void -usbLogInputProblem (UsbEndpoint *endpoint, const char *problem) { - logMessage(LOG_WARNING, "%s: Ept:%02X", - problem, endpoint->descriptor->bEndpointAddress); -} - static int usbHandleInputURB (UsbEndpoint *endpoint, struct usbdevfs_urb *urb) { - int written = 0; + deleteItem(endpoint->direction.input.pending.requests, urb); - if (urb->actual_length == 0) { - written = 1; - } else if (urb->actual_length > 0) { - if (usbEnqueueInput(endpoint, urb->buffer, urb->actual_length)) { - written = 1; - } else { - usbLogInputProblem(endpoint, "input data not enqueued"); - } - } else { - usbLogInputProblem(endpoint, "input data not available"); + if (urb->actual_length < 0) { + usbLogInputProblem(endpoint, "data not available"); + return 0; } - deleteItem(endpoint->direction.input.pending, urb); - if (!written) return 0; - - usbAddPendingInputRequest(endpoint); - return 1; + return usbHandleInputResponse(endpoint, urb->buffer, urb->actual_length);; } static void @@ -991,7 +974,7 @@ ASYNC_SIGNAL_CALLBACK(usbHandleInputSignal) { } if (!handled) { - usbSetInputError(endpoint, errno); + usbSetEndpointInputError(endpoint, errno); usbStopSignalMonitor(eptx); } @@ -1015,12 +998,12 @@ usbStartSignalMonitor (UsbEndpoint *endpoint) { eptx->monitor.signal.number); return 1; } else { - usbLogInputProblem(endpoint, "input monitor not registered"); + usbLogInputProblem(endpoint, "monitor not registered"); } asyncRelinquishSignalNumber(eptx->monitor.signal.number); } else { - usbLogInputProblem(endpoint, "input signal number not obtained"); + usbLogInputProblem(endpoint, "signal number not obtained"); } return 0; @@ -1065,7 +1048,15 @@ ASYNC_MONITOR_CALLBACK(usbHandleCompletedInputRequests) { UsbDevice *device = parameters->data; UsbEndpoint *endpoint; - if (parameters->error) return 0; + { + int error = parameters->error; + + if (error) { + logActionError(error, "USBFS output monitor"); + usbSetDeviceInputError(device, errno); + return 0; + } + } while ((endpoint = usbReapURB(device, 0))) { UsbEndpointExtension *eptx = endpoint->extension; @@ -1076,7 +1067,7 @@ ASYNC_MONITOR_CALLBACK(usbHandleCompletedInputRequests) { { int handled = usbHandleCompletedInputRequest(endpoint, urb); - if (!handled) usbSetInputError(endpoint, errno); + if (!handled) usbSetEndpointInputError(endpoint, errno); free(urb); if (!handled) return 0; @@ -1084,7 +1075,9 @@ ASYNC_MONITOR_CALLBACK(usbHandleCompletedInputRequests) { } } - return 1; + if (errno == EAGAIN) return 1; + usbSetDeviceInputError(device, errno); + return 0; } static int @@ -1132,12 +1125,12 @@ usbPrepareInputEndpoint (UsbEndpoint *endpoint) { if (monitorStarted) { return 1; } else { - usbLogInputProblem(endpoint, "USB input monitor not started"); + usbLogInputProblem(endpoint, "monitor not started"); } usbDestroyInputPipe(endpoint); } else { - usbLogInputProblem(endpoint, "input pipe not created"); + usbLogInputProblem(endpoint, "pipe not created"); } return 0; diff --git a/Programs/usb_netbsd.c b/Programs/usb_netbsd.c index b6d19d1809a5919d3c29da4cca53c437c43f6a0a..87f3c3a2737a7b0a340bb86aafb6e059125faaba 100644 --- a/Programs/usb_netbsd.c +++ b/Programs/usb_netbsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_none.c b/Programs/usb_none.c index 38b6bb09418188837ec6197bf2626a6c7afb3176..c4b250ec3192e84975083d27efcb9fb95411d89b 100644 --- a/Programs/usb_none.c +++ b/Programs/usb_none.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_openbsd.c b/Programs/usb_openbsd.c index b6d19d1809a5919d3c29da4cca53c437c43f6a0a..87f3c3a2737a7b0a340bb86aafb6e059125faaba 100644 --- a/Programs/usb_openbsd.c +++ b/Programs/usb_openbsd.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_serial.c b/Programs/usb_serial.c index 14d5beb6359c6445fe165ff65ad3cd767d0f3c09..e3ffaa7dd21c37dd999637f3df7c4ca32d88c593 100644 --- a/Programs/usb_serial.c +++ b/Programs/usb_serial.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_serial.h b/Programs/usb_serial.h index dcbe726cecb5b37864f4ea865ab393a255912cf2..e466a84b095d2d40caedfffc15a200243903022a 100644 --- a/Programs/usb_serial.h +++ b/Programs/usb_serial.h @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/usb_solaris.c b/Programs/usb_solaris.c index 6f1d019b2d4857fb8825d2c004cd8281683af25e..4b059f84c16191a4ff9c000f82ebdedc52c28e7f 100644 --- a/Programs/usb_solaris.c +++ b/Programs/usb_solaris.c @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/variables.c b/Programs/variables.c new file mode 100644 index 0000000000000000000000000000000000000000..0a02d5b786cf807cb89a87fbc54a761e4a5b6917 --- /dev/null +++ b/Programs/variables.c @@ -0,0 +1,345 @@ +/* + * BRLTTY - A background process providing access to 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 . + */ + +#include "prologue.h" + +#include + +#include "log.h" +#include "strfmt.h" +#include "variables.h" +#include "queue.h" +#include "charset.h" + +typedef struct { + const wchar_t *characters; + int length; +} CharacterString; + +static void +initializeCharacterString (CharacterString *string) { + string->characters = WS_C("\0"); + string->length = 0; +} + +static void +clearCharacterString (CharacterString *string) { + if (string->length > 0) free((void *)string->characters); + initializeCharacterString(string); +} + +static int +setCharacterString (CharacterString *string, const wchar_t *characters, int length) { + if (!length) { + clearCharacterString(string); + } else { + wchar_t *newCharacters; + + if (!(newCharacters = malloc(ARRAY_SIZE(newCharacters, (length + 1))))) { + logMallocError(); + return 0; + } + + wmemcpy(newCharacters, characters, length); + newCharacters[length] = WC_C('\0'); + + clearCharacterString(string); + string->characters = newCharacters; + string->length = length; + } + + return 1; +} + +static void +getCharacterString (const CharacterString *string, const wchar_t **characters, int *length) { + *characters = string->characters; + *length = string->length; +} + +struct VariableStruct { + CharacterString name; + CharacterString value; +}; + +struct VariableNestingLevelStruct { + const char *name; + VariableNestingLevel *previous; + Queue *variables; + unsigned int references; +}; + +VariableNestingLevel * +claimVariableNestingLevel (VariableNestingLevel *vnl) { + vnl->references += 1; + return vnl; +} + +static void +deallocateVariable (void *item, void *data) { + Variable *variable = item; + + clearCharacterString(&variable->name); + clearCharacterString(&variable->value); + free(variable); +} + +VariableNestingLevel * +newVariableNestingLevel (VariableNestingLevel *previous, const char *name) { + VariableNestingLevel *vnl; + + if ((vnl = malloc(sizeof(*vnl)))) { + memset(vnl, 0, sizeof(*vnl)); + vnl->name = name; + vnl->references = 0; + + if ((vnl->variables = newQueue(deallocateVariable, NULL))) { + if ((vnl->previous = previous)) claimVariableNestingLevel(previous); + return vnl; + } + } else { + logMallocError(); + } + + return NULL; +} + +static void +destroyVariableNestingLevel (VariableNestingLevel *vnl) { + deallocateQueue(vnl->variables); + free(vnl); +} + +VariableNestingLevel * +removeVariableNestingLevel (VariableNestingLevel *vnl) { + VariableNestingLevel *previous = vnl->previous; + if (!--vnl->references) destroyVariableNestingLevel(vnl); + return previous; +} + +void +releaseVariableNestingLevel (VariableNestingLevel *vnl) { + while (vnl && !--vnl->references) { + VariableNestingLevel *previous = vnl->previous; + destroyVariableNestingLevel(vnl); + vnl = previous; + } +} + +static void +listVariableLine (const char *line) { + logMessage(LOG_NOTICE, "%s", line); +} + +static int +listVariable (void *item, void *data) { + const Variable *variable = item; + + char line[0X100]; + STR_BEGIN(line, sizeof(line)); + + STR_PRINTF("variable: "); + STR_PRINTF("%.*" PRIws, variable->name.length, variable->name.characters); + STR_PRINTF(" = "); + STR_PRINTF("%.*" PRIws, variable->value.length, variable->value.characters); + + STR_END; + listVariableLine(line); + + return 0; +} + +void +listVariables (VariableNestingLevel *from) { + listVariableLine("begin variable listing"); + + while (from) { + { + char header[0X100]; + STR_BEGIN(header, sizeof(header)); + + STR_PRINTF("variable nesting level:"); + if (from->name) STR_PRINTF(" %s", from->name); + if (from->references != 1) STR_PRINTF(" Refs:%u", from->references); + + STR_END; + listVariableLine(header); + } + + processQueue(from->variables, listVariable, NULL); + from = from->previous; + } + + listVariableLine("end variable listing"); +} + +static int +testVariableName (const void *item, void *data) { + const Variable *variable = item; + const CharacterString *key = data; + + if (variable->name.length == key->length) { + if (wmemcmp(variable->name.characters, key->characters, key->length) == 0) { + return 1; + } + } + + return 0; +} + +static Variable * +findVariable (VariableNestingLevel *vnl, const wchar_t *name, int length, int create) { + Variable *variable; + + { + CharacterString key = { + .characters = name, + .length = length + }; + + if ((variable = findItem(vnl->variables, testVariableName, &key))) return variable; + } + + if (create) { + if ((variable = malloc(sizeof(*variable)))) { + memset(variable, 0, sizeof(*variable)); + initializeCharacterString(&variable->name); + initializeCharacterString(&variable->value); + + if (setCharacterString(&variable->name, name, length)) { + if (enqueueItem(vnl->variables, variable)) { + return variable; + } + + clearCharacterString(&variable->name); + } + + free(variable); + } else { + logMallocError(); + } + } + + return NULL; +} + +const Variable * +findReadableVariable (VariableNestingLevel *vnl, const wchar_t *name, int length) { + while (vnl) { + Variable *variable = findVariable(vnl, name, length, 0); + if (variable) return variable; + vnl = vnl->previous; + } + + return NULL; +} + +Variable * +findWritableVariable (VariableNestingLevel *vnl, const wchar_t *name, int length) { + return findVariable(vnl, name, length, 1); +} + +void +deleteVariables (VariableNestingLevel *vnl) { + deleteElements(vnl->variables); +} + +int +setVariable (Variable *variable, const wchar_t *value, int length) { + return setCharacterString(&variable->value, value, length); +} + +void +getVariableName (const Variable *variable, const wchar_t **characters, int *length) { + getCharacterString(&variable->name, characters, length); +} + +void +getVariableValue (const Variable *variable, const wchar_t **characters, int *length) { + getCharacterString(&variable->value, characters, length); +} + +int +setStringVariable (VariableNestingLevel *vnl, const char *name, const char *value) { + size_t nameLength = getUtf8Length(name); + wchar_t nameBuffer[nameLength + 1]; + + size_t valueLength = getUtf8Length(value); + wchar_t valueBuffer[valueLength + 1]; + + { + const char *utf8 = name; + wchar_t *wc = nameBuffer; + convertUtf8ToWchars(&utf8, &wc, ARRAY_COUNT(nameBuffer)); + } + + { + const char *utf8 = value; + wchar_t *wc = valueBuffer; + convertUtf8ToWchars(&utf8, &wc, ARRAY_COUNT(valueBuffer)); + } + + Variable *variable = findVariable(vnl, nameBuffer, nameLength, 1); + + if (variable) { + if (setVariable(variable, valueBuffer, valueLength)) { + return 1; + } + } + + return 0; +} + +int +setStringVariables (VariableNestingLevel *vnl, const VariableInitializer *initializers) { + if (initializers) { + const VariableInitializer *initializer = initializers; + + while (initializer->name) { + if (!setStringVariable(vnl, initializer->name, initializer->value)) return 0; + initializer += 1; + } + } + + return 1; +} + +VariableNestingLevel * +getGlobalVariables (int create) { + static VariableNestingLevel *globalVariables = NULL; + + if (!globalVariables) { + VariableNestingLevel *vnl; + + if (!(vnl = newVariableNestingLevel(NULL, "global"))) { + return NULL; + } + + claimVariableNestingLevel(vnl); + globalVariables = vnl; + } + + return globalVariables; +} + +int +setGlobalVariable (const char *name, const char *value) { + VariableNestingLevel *vnl = getGlobalVariables(1); + if (!vnl) return 0; + return setStringVariable(vnl, name, value); +} diff --git a/Programs/xbrlapi.c b/Programs/xbrlapi.c index 04f9f5bbc22d9dae8fac0325526597926bc90b0c..489d73f5e5e5e9b4ed194539c3807e8ce913a002 100644 --- a/Programs/xbrlapi.c +++ b/Programs/xbrlapi.c @@ -1,7 +1,7 @@ /* * XBrlAPI - A background process tinkering with X for proper BrlAPI behavior * - * Copyright (C) 2003-2015 by Samuel Thibault + * Copyright (C) 2003-2016 by Samuel Thibault * * XBrlAPI comes with ABSOLUTELY NO WARRANTY. * @@ -75,6 +75,8 @@ static char *host; static char *xDisplay; static int quiet; +static int brlapi_fd; + BEGIN_OPTION_TABLE(programOptions) { .letter = 'b', .word = "brlapi", @@ -108,6 +110,15 @@ END_OPTION_TABLE * error handling */ +static void api_cleanExit(void) { + if (brlapi_fd>=0) + { + close(brlapi_fd); + brlapi_fd=-1; + } +} + +/* dumps errors which are fatal to brlapi only */ static void fatal_brlapi_errno(const char *msg, const char *fmt, ...) { brlapi_perror(msg); if (fmt) { @@ -116,9 +127,17 @@ static void fatal_brlapi_errno(const char *msg, const char *fmt, ...) { vfprintf(stderr,fmt,va); va_end(va); } - exit(PROG_EXIT_FATAL); + api_cleanExit(); +} + +static void exception_handler(int error, brlapi_packetType_t type, const void *packet, size_t size) { + char str[0X100]; + brlapi_strexception(str,0X100, error, type, packet, size); + fprintf(stderr, "xbrlapi: BrlAPI exception: %s\nDisconnecting from brlapi\n", str); + api_cleanExit(); } +/* dumps errors which are fatal to the whole xbrlapi */ static void fatal_errno(const char *msg, const char *fmt, ...) { perror(msg); if (fmt) { @@ -149,36 +168,34 @@ static void fatal(const char *fmt, ...) { #define MIN(a, b) (((a) < (b))? (a): (b)) #endif /* MIN */ -static int brlapi_fd; - -static void api_cleanExit(int foo) { - close(brlapi_fd); - exit(PROG_EXIT_SUCCESS); -} - -static void tobrltty_init(char *auth, char *host) { +static int tobrltty_init(char *auth, char *host) { brlapi_connectionSettings_t settings; unsigned int x,y; settings.host=host; settings.auth=auth; - signal(SIGTERM,api_cleanExit); - signal(SIGINT,api_cleanExit); -#ifdef SIGHUP - signal(SIGHUP,api_cleanExit); -#endif /* SIGHUP */ -#ifdef SIGQUIT - signal(SIGQUIT,api_cleanExit); -#endif /* SIGQUIT */ -#ifdef SIGPIPE - signal(SIGPIPE,api_cleanExit); -#endif /* SIGPIPE */ - if ((brlapi_fd = brlapi_openConnection(&settings,&settings))<0) - fatal_brlapi_errno("openConnection",gettext("cannot connect to brltty at %s\n"),settings.host); + { + static int tried; + if (!tried) + { + /* 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; + fatal_brlapi_errno("openConnection",gettext("cannot connect to braille devices daemon brltty at %s\n"),settings.host); + } + return 0; + } if (brlapi_getDisplaySize(&x,&y)<0) + { fatal_brlapi_errno("getDisplaySize",NULL); + return 0; + } + + brlapi_setExceptionHandler(exception_handler); + return 1; } static int getXVTnb(void); @@ -193,36 +210,70 @@ static void getVT(void) { if (path || vtnr || vtno == -1) { if (brlapi_enterTtyModeWithPath(NULL,0,NULL)<0) + { fatal_brlapi_errno("geTtyPath",gettext("cannot get tty\n")); + return; + } } else { if (brlapi_enterTtyMode(vtno,NULL)<0) + { fatal_brlapi_errno("enterTtyMode",gettext("cannot get tty %d\n"),vtno); + return; + } } if (brlapi_ignoreAllKeys()<0) + { fatal_brlapi_errno("ignoreAllKeys",gettext("cannot ignore keys\n")); + return; + } #ifdef CAN_SIMULATE_KEY_PRESSES /* All X keysyms with any modifier */ brlapi_keyCode_t cmd = BRLAPI_KEY_TYPE_SYM; if (brlapi_acceptKeys(brlapi_rangeType_type, &cmd, 1)) + { fatal_brlapi_errno("acceptKeys",NULL); + return; + } cmd = BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_SHIFT; if (brlapi_acceptKeys(brlapi_rangeType_key, &cmd, 1)) + { fatal_brlapi_errno("acceptKeys",NULL); + return; + } cmd = BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_UPPER; if (brlapi_acceptKeys(brlapi_rangeType_key, &cmd, 1)) + { fatal_brlapi_errno("acceptKeys",NULL); + return; + } cmd = BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_CONTROL; if (brlapi_acceptKeys(brlapi_rangeType_key, &cmd, 1)) + { fatal_brlapi_errno("acceptKeys",NULL); + return; + } cmd = BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_META; if (brlapi_acceptKeys(brlapi_rangeType_key, &cmd, 1)) + { fatal_brlapi_errno("acceptKeys",NULL); + return; + } #endif /* CAN_SIMULATE_KEY_PRESSES */ } +static char *last_name; + +static void api_setLastName(void) { + if (!last_name) return; + if (brlapi_writeText(0,last_name)<0) { + brlapi_perror("writeText"); + fprintf(stderr,gettext("xbrlapi: cannot write window name %s\n"),last_name); + } +} + static void api_setName(const char *wm_name) { - static char *last_name; + if (brlapi_fd<0) return; debugf("%s got focus\n",wm_name); if (last_name) { @@ -230,17 +281,22 @@ static void api_setName(const char *wm_name) { free(last_name); } if (!(last_name=strdup(wm_name))) fatal_errno("strdup(wm_name)",NULL); + api_setLastName(); +} - if (brlapi_writeText(0,wm_name)<0) { - brlapi_perror("writeText"); - fprintf(stderr,gettext("cannot write window name %s\n"),wm_name); - } +static int last_win; + +static void api_setLastFocus(void) +{ + if (brlapi_setFocus(last_win)<0) + fatal_brlapi_errno("setFocus",gettext("cannot set focus to %#010x\n"),last_win); } static void api_setFocus(int win) { + if (brlapi_fd<0) return; debugf("%#010x (%d) got focus\n",win,win); - if (brlapi_setFocus(win)<0) - fatal_brlapi_errno("setFocus",gettext("cannot set focus to %#010x\n"),win); + last_win = win; + api_setLastFocus(); } /****************************************************************************** @@ -309,8 +365,8 @@ static int ErrorHandler(Display *dpy, XErrorEvent *ev) { } if (!XGetErrorText(dpy, ev->error_code, buffer, sizeof(buffer))) fatal("XGetErrorText"); - fprintf(stderr,gettext("X Error %d, %s on display %s\n"), ev->type, buffer, XDisplayName(Xdisplay)); - fprintf(stderr,gettext("resource %#010lx, req %u:%u\n"),ev->resourceid,ev->request_code,ev->minor_code); + fprintf(stderr,gettext("xbrlapi: X Error %d, %s on display %s\n"), ev->type, buffer, XDisplayName(Xdisplay)); + fprintf(stderr,gettext("xbrlapi: resource %#010lx, req %u:%u\n"),ev->resourceid,ev->request_code,ev->minor_code); exit(PROG_EXIT_FATAL); } @@ -327,22 +383,22 @@ static int getXVTnb(void) { root=DefaultRootWindow(dpy); if ((property=XInternAtom(dpy,"XFree86_VT",False))==None) { - fprintf(stderr,gettext("no XFree86_VT atom\n")); + fprintf(stderr,gettext("xbrlapi: no XFree86_VT atom\n")); return -1; } if (XGetWindowProperty(dpy,root,property,0,1,False,AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &buf)) { - fprintf(stderr,gettext("cannot get root window XFree86_VT property\n")); + fprintf(stderr,gettext("xbrlapi: cannot get root window XFree86_VT property\n")); return -1; } if (nitems<1) { - fprintf(stderr, gettext("no items for VT number\n")); + fprintf(stderr, gettext("xbrlapi: no items for VT number\n")); goto out; } if (nitems>1) - fprintf(stderr,gettext("more than one item for VT number\n")); + fprintf(stderr,gettext("xbrlapi: more than one item for VT number\n")); switch (actual_type) { case XA_CARDINAL: case XA_INTEGER: @@ -351,10 +407,10 @@ static int getXVTnb(void) { case 8: vt = (*(uint8_t *)buf); break; case 16: vt = (*(uint16_t *)buf); break; case 32: vt = (*(uint32_t *)buf); break; - default: fprintf(stderr, gettext("bad format for VT number\n")); goto out; + default: fprintf(stderr, gettext("xbrlapi: bad format for VT number\n")); goto out; } break; - default: fprintf(stderr, gettext("bad type for VT number\n")); goto out; + default: fprintf(stderr, gettext("xbrlapi: bad type for VT number\n")); goto out; } out: if (!XFree(buf)) fatal("XFree(VTnobuf)"); @@ -476,7 +532,7 @@ static void setFocus(Window win) { if (!quiet) { if (!(window=window_of_Window(win))) { - fprintf(stderr,gettext("didn't grab window %#010lx but got focus\n"),win); + fprintf(stderr,gettext("xbrlapi: didn't grab window %#010lx but got focus\n"),win); api_setName("unknown"); } else setName(window); } @@ -500,7 +556,10 @@ static void ignoreServerKeys(void) { .last = BRLAPI_KEY_FLG(ControlMask|Mod1Mask)|~BRLAPI_KEY_FLAGS_MASK, }; if (brlapi_ignoreKeyRanges(&range, 1)) + { fatal_brlapi_errno("ignoreKeyRanges",NULL); + return; + } } #endif /* CAN_SIMULATE_KEY_PRESSES */ @@ -509,7 +568,7 @@ static void toX_f(const char *display) { XEvent ev; int i; int X_fd; - fd_set fds,readfds; + fd_set readfds; int maxfd; #ifdef CAN_SIMULATE_KEY_PRESSES int res; @@ -539,15 +598,14 @@ static void toX_f(const char *display) { } X_fd = XConnectionNumber(dpy); - FD_ZERO(&fds); - FD_SET(brlapi_fd, &fds); - FD_SET(X_fd, &fds); - maxfd = X_fd>brlapi_fd ? X_fd+1 : brlapi_fd+1; - getVT(); + if (brlapi_fd>=0) + { + getVT(); #ifdef CAN_SIMULATE_KEY_PRESSES - ignoreServerKeys(); + ignoreServerKeys(); #endif /* CAN_SIMULATE_KEY_PRESSES */ + } netWmNameAtom = XInternAtom(dpy,"_NET_WM_NAME",False); utf8StringAtom = XInternAtom(dpy,"UTF8_STRING",False); @@ -576,9 +634,15 @@ static void toX_f(const char *display) { setFocus(win); } while(1) { + struct timeval timeout={.tv_sec=1,.tv_usec=0}; XFlush(dpy); - memcpy(&readfds,&fds,sizeof(readfds)); - if (select(maxfd,&readfds,NULL,NULL,NULL)<0) + FD_ZERO(&readfds); + if (brlapi_fd>=0) + FD_SET(brlapi_fd, &readfds); + FD_SET(X_fd, &readfds); + maxfd = brlapi_fd>=0 && X_fdroot,getWindowTitle(win)); } break; @@ -637,7 +701,7 @@ static void toX_f(const char *display) { debugf("WM_NAME property of %#010lx changed\n",win); struct window *window; if (!(window=window_of_Window(win))) { - fprintf(stderr,gettext("didn't grab window %#010lx\n"),win); + fprintf(stderr,gettext("xbrlapi: didn't grab window %#010lx\n"),win); add_window(win,None,getWindowTitle(win)); } else { if (window->wm_name) @@ -645,7 +709,7 @@ static void toX_f(const char *display) { if ((window->wm_name=getWindowTitle(win))) { if (!quiet && win==curWindow) api_setName(window->wm_name); - } else fprintf(stderr,gettext("window %#010lx changed to NULL name\n"),win); + } else fprintf(stderr,gettext("xbrlapi: window %#010lx changed to NULL name\n"),win); } } break; @@ -666,11 +730,12 @@ static void toX_f(const char *display) { break; /* "shouldn't happen" events */ - default: fprintf(stderr,gettext("unhandled event type: %d\n"),ev.type); break; + default: fprintf(stderr,gettext("xbrlapi: unhandled event type: %d\n"),ev.type); break; } } + if (brlapi_fd>=0 && FD_ISSET(brlapi_fd,&readfds)) { #ifdef CAN_SIMULATE_KEY_PRESSES - if (haveXTest && FD_ISSET(brlapi_fd,&readfds)) { + if (haveXTest) { while (((res = brlapi_readKey(0, &code))==1)) { switch (code & BRLAPI_KEY_TYPE_MASK) { case BRLAPI_KEY_TYPE_CMD: @@ -717,7 +782,7 @@ static void toX_f(const char *display) { } default: - fprintf(stderr, "%s: %" BRLAPI_PRIxKEYCODE "\n", + fprintf(stderr, "xbrlapi: %s: %" BRLAPI_PRIxKEYCODE "\n", gettext("unexpected cmd"), code); break; } @@ -727,7 +792,7 @@ static void toX_f(const char *display) { keysym = code & BRLAPI_KEY_CODE_MASK; keycode = XKeysymToKeycode(dpy,keysym); if (keycode == NoSymbol) { - fprintf(stderr,gettext("Couldn't translate keysym %08X to keycode.\n"),keysym); + fprintf(stderr,gettext("xbrlapi: Couldn't translate keysym %08X to keycode.\n"),keysym); continue; } @@ -751,7 +816,7 @@ static void toX_f(const char *display) { if (tryModifiers(keycode, &modifiers, *try, keysym)) goto foundModifiers; } while (*++try); - fprintf(stderr,gettext("Couldn't find modifiers to apply to %d for getting keysym %08X\n"),keycode,keysym); + fprintf(stderr,gettext("xbrlapi: Couldn't find modifiers to apply to %d for getting keysym %08X\n"),keycode,keysym); continue; } foundModifiers: @@ -767,7 +832,7 @@ static void toX_f(const char *display) { XkbLockModifiers(dpy, XkbUseCoreKbd, modifiers, 0); break; default: - fprintf(stderr, "%s: %" BRLAPI_PRIxKEYCODE "\n", + fprintf(stderr, "xbrlapi: %s: %" BRLAPI_PRIxKEYCODE "\n", gettext("unexpected block type"), code); next_modifiers = 0; break; @@ -775,8 +840,20 @@ static void toX_f(const char *display) { } if (res<0) fatal_brlapi_errno("brlapi_readKey",NULL); - } + } #endif /* CAN_SIMULATE_KEY_PRESSES */ + } else { + /* Try to reconnect */ + if (tobrltty_init(auth,host)) + { + getVT(); +#ifdef CAN_SIMULATE_KEY_PRESSES + ignoreServerKeys(); +#endif /* CAN_SIMULATE_KEY_PRESSES */ + api_setLastName(); + api_setLastFocus(); + } + } } } @@ -784,6 +861,11 @@ static void toX_f(const char *display) { * main */ +static void term_handler(int foo) { + api_cleanExit(); + exit(PROG_EXIT_SUCCESS); +} + int main (int argc, char *argv[]) { { @@ -794,6 +876,18 @@ main (int argc, char *argv[]) { PROCESS_OPTIONS(descriptor, argc, argv); } + signal(SIGTERM,term_handler); + signal(SIGINT,term_handler); +#ifdef SIGHUP + signal(SIGHUP,term_handler); +#endif /* SIGHUP */ +#ifdef SIGQUIT + signal(SIGQUIT,term_handler); +#endif /* SIGQUIT */ +#ifdef SIGPIPE + signal(SIGPIPE,term_handler); +#endif /* SIGPIPE */ + tobrltty_init(auth,host); toX_f(xDisplay); diff --git a/README b/README index 1dd10270f7c520d5cd281b213b933b111ab983f8..cc2b91c17e20bed39a22317b5ac43a10f8446988 100644 --- a/README +++ b/README @@ -2,9 +2,9 @@ BRLTTY is a background process (daemon) providing access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. -Version 5.3.1, Dec 2015 +Version 5.4, Jun 2016 -Copyright (C) 1995-2015 by The BRLTTY Developers. +Copyright (C) 1995-2016 by The BRLTTY Developers. Web Page: http://brltty.com/ @@ -167,13 +167,15 @@ BRLTTY has been tested on: * an Alpha workstation * a StrongARM based Netwinder * several Linux kernels (1.2.13 and beyond) -* all major Linux distributions (including Red Hat, Debian, Slackware, SuSE) +* all major Linux distributions (including Red Hat, Fedora, Debian, Ubuntu, Slackware, SuSE) * Solaris/Sparc (release 7 and beyond) * Solaris/Intel (release 9 and beyond) * OpenBSD/Intel (release 3.4 and beyond) * FreeBSD/Intel (release 5.1 and beyond) * NetBSD/Intel (release 1.6 and beyond) * Windows 95/98/XP +* MS-DOS +* Mac OS X (in conjunction with a supplied patch for the screen program) * Android/ARM (4.0 and beyond) The following braille displays are supported: @@ -190,7 +192,7 @@ The following braille displays are supported: - BrailComm [III] - BrailleLite [18/40/M20/M40] - BrailleMemo [Pocket (16), Smart (16), 32, 40] -- BrailleNote [18/32] +- BrailleNote [18/32, Apex] - Braudi - BrlAPI - Cebra [20/40/60/80/100/120/140] @@ -205,7 +207,7 @@ The following braille displays are supported: Braille Wave, Easy Braille, Braille Star 40/80, Connect Braille 40, Bookworm] - Hedo [ProfiLine, MobilLine] -- HIMS [Braille Sense, SyncBraille, Braille Edge] +- HIMS [Braille Sense, SyncBraille, Braille Edge, Smart Beetle] - HumanWare [Brailliant 32/40/80 bi] - Iris - Libbraille diff --git a/Tables/Attributes/invleft_right.atb b/Tables/Attributes/invleft_right.atb index 06961e69a0d6bbd38cb5efbd4283b9e1b86792dd..6f1c2db12414b75e3ce2367c266f64c69af4c9c0 100644 --- a/Tables/Attributes/invleft_right.atb +++ b/Tables/Attributes/invleft_right.atb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Attributes/left_right.atb b/Tables/Attributes/left_right.atb index f12cde62b6ab563041591d8d884fe5c65d148fb9..de0dc2ec7d2ec247721e0054ace75c45d252de1b 100644 --- a/Tables/Attributes/left_right.atb +++ b/Tables/Attributes/left_right.atb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Attributes/upper_lower.atb b/Tables/Attributes/upper_lower.atb index 216879dd44a29e0238e637b1138c330d75224b80..6bd6bf392a76263da0812376f58a8c68d6d8458d 100644 --- a/Tables/Attributes/upper_lower.atb +++ b/Tables/Attributes/upper_lower.atb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/af.ctb b/Tables/Contraction/af.ctb index 56c899a6d7b254c92fe3beb795792f07e829c160..62e346e27cf2741ae3dee42e13c764c48bf81270 100644 --- a/Tables/Contraction/af.ctb +++ b/Tables/Contraction/af.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/am.ctb b/Tables/Contraction/am.ctb index 5370fb7117270be0034dbaa15574a4ae8a62c589..851f9647b407b0cb9b67902cb54cd8100f98899b 100644 --- a/Tables/Contraction/am.ctb +++ b/Tables/Contraction/am.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/countries.cti b/Tables/Contraction/countries.cti index 87ff64ec5b38847763e9e24bec26fbe65616e161..861e67888606c4961b005001fa49b7d1dcec6995 100644 --- a/Tables/Contraction/countries.cti +++ b/Tables/Contraction/countries.cti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/de-basis.ctb b/Tables/Contraction/de-basis.ctb index 17d09c8da902e84b5714c19518aedc25b0d0eb84..6ee7c79e848b380753baf32e6bd5ddb90a854552 100644 --- a/Tables/Contraction/de-basis.ctb +++ b/Tables/Contraction/de-basis.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/de-kurzschrift.ctb b/Tables/Contraction/de-kurzschrift.ctb index b2ba92372a639629f7ca83c8f9e3e41b7c4dbfeb..53f7965393c5ffa656e143106f8bd6b6cd2fce96 100644 --- a/Tables/Contraction/de-kurzschrift.ctb +++ b/Tables/Contraction/de-kurzschrift.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/de-vollschrift.ctb b/Tables/Contraction/de-vollschrift.ctb index 409d6d79bddb20e0fea09cd1413ad81da456456f..1475c5bb5502a307c522f26bdf4ea2005e7d52e4 100644 --- a/Tables/Contraction/de-vollschrift.ctb +++ b/Tables/Contraction/de-vollschrift.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/en-ueb-g2.ctb b/Tables/Contraction/en-ueb-g2.ctb index 6160c763a15228643426cd8ca29474febe98fc26..e2c501bdaa9f98463e0b1db25cee89c0775a15f7 100644 --- a/Tables/Contraction/en-ueb-g2.ctb +++ b/Tables/Contraction/en-ueb-g2.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/en-us-g2.ctb b/Tables/Contraction/en-us-g2.ctb index bf17d0a92da988cc24196c3a9df997c57cb5d520..a52d8aaeb8d4c1cab0c016049e26b22859178b75 100644 --- a/Tables/Contraction/en-us-g2.ctb +++ b/Tables/Contraction/en-us-g2.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/es.ctb b/Tables/Contraction/es.ctb index 76214433ed40d209b200873155754c4492c204a9..05f0ef7acdb7538cf9035f2f9ddd01bd176f942b 100644 --- a/Tables/Contraction/es.ctb +++ b/Tables/Contraction/es.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/fr-abrege.ctb b/Tables/Contraction/fr-abrege.ctb index 7276bd9c275fdeb0fe3645ef394a73c02ba6fccd..55ee0565d1116e361200b53f7ff0677aaeb7cf99 100644 --- a/Tables/Contraction/fr-abrege.ctb +++ b/Tables/Contraction/fr-abrege.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/fr-integral.ctb b/Tables/Contraction/fr-integral.ctb index 77e8a9b27e00c680d4fe28273e915d367dc371fe..752ed029c2082608861c22e41356a6b838cb6814 100644 --- a/Tables/Contraction/fr-integral.ctb +++ b/Tables/Contraction/fr-integral.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ha.ctb b/Tables/Contraction/ha.ctb index c9705ac04749ee71c258ded87571b1142a9921d7..c1a20252d02c6e54ad924170fb4a6cc3c3799efa 100644 --- a/Tables/Contraction/ha.ctb +++ b/Tables/Contraction/ha.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/id.ctb b/Tables/Contraction/id.ctb index 3e1e9f304b2bb9a521e1380630e8282021425ff8..393c123ba2a6d72adb6acccef2d1b7c6b7dc3a78 100644 --- a/Tables/Contraction/id.ctb +++ b/Tables/Contraction/id.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ipa.ctb b/Tables/Contraction/ipa.ctb index 30c893868b290d5f37670626488c2d7ace0c986c..8cdc760713457aa591c2cfa23ea7b244dd0cd242 100644 --- a/Tables/Contraction/ipa.ctb +++ b/Tables/Contraction/ipa.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ja.ctb b/Tables/Contraction/ja.ctb index faea6ef4527a699da51bf63750e1b9ae095d2d96..5ac8d6ea473bc26b98354b0fe1f9768eed4cba11 100644 --- a/Tables/Contraction/ja.ctb +++ b/Tables/Contraction/ja.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ko-g1.ctb b/Tables/Contraction/ko-g1.ctb index 5b920b91d17567ed3ae02b3e807511413642239e..6aaae2ab862181f0e43d04bf7beaa877da43ca4e 100644 --- a/Tables/Contraction/ko-g1.ctb +++ b/Tables/Contraction/ko-g1.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ko-g2.ctb b/Tables/Contraction/ko-g2.ctb index e11e55525ab347c7136f95f73ef63880d6a05b79..49604807f5283757d05dea9792eca842c23e27a1 100644 --- a/Tables/Contraction/ko-g2.ctb +++ b/Tables/Contraction/ko-g2.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ko.ctb b/Tables/Contraction/ko.ctb index a04f6dbb2dcad1ca72346cccf7227283a1f5636f..0dc5f923becceedaafaff3287d7b07309691588d 100644 --- a/Tables/Contraction/ko.ctb +++ b/Tables/Contraction/ko.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/latex-access.ctb b/Tables/Contraction/latex-access.ctb index 4e6aaadb982547a98187623f04c18169ce66d41d..3289035d4abeb93ae11fcbc8656cb00df5ab4ade 100755 --- a/Tables/Contraction/latex-access.ctb +++ b/Tables/Contraction/latex-access.ctb @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/letters-latin.cti b/Tables/Contraction/letters-latin.cti index 27b78a63ca2954fa8afed8ca2dddd43e576b6907..3c37a82dbc5e878e1daa14e1abce4c029fb07cc1 100644 --- a/Tables/Contraction/letters-latin.cti +++ b/Tables/Contraction/letters-latin.cti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/mg.ctb b/Tables/Contraction/mg.ctb index afd4d05abe082f9a57ea47969e673f0a92c0c655..83162779821f7ddc7439d4dcf23bce46eb911b92 100644 --- a/Tables/Contraction/mg.ctb +++ b/Tables/Contraction/mg.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/mun.ctb b/Tables/Contraction/mun.ctb index 49e768fb4febc3738b467a322db779de3a8fefb6..85d7476168575a5e9a190245cab33d946e62ec48 100644 --- a/Tables/Contraction/mun.ctb +++ b/Tables/Contraction/mun.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/nabcc.cti b/Tables/Contraction/nabcc.cti index 26a94507050ab6587512e8a8066df7be0c374a2c..2bae7ef2225390c56b37c6fabb665c6ea719d322 100644 --- a/Tables/Contraction/nabcc.cti +++ b/Tables/Contraction/nabcc.cti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/nl.ctb b/Tables/Contraction/nl.ctb index 8bcf5e76dec26fe64a8c1a6294315938933a2f70..ddf4104a4ec7f51e86b9a019381e057646971f3e 100644 --- a/Tables/Contraction/nl.ctb +++ b/Tables/Contraction/nl.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ny.ctb b/Tables/Contraction/ny.ctb index 119081b9047309663b5356f618a61590b877078f..7ebd29f7e1e41f0030895924f7f7be0ae8106777 100644 --- a/Tables/Contraction/ny.ctb +++ b/Tables/Contraction/ny.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/pt.ctb b/Tables/Contraction/pt.ctb index 5fadcda633208da2324675e2295fba09ff9556c2..3a2023feab7f844a722ad7393e99a8f2e170ff56 100644 --- a/Tables/Contraction/pt.ctb +++ b/Tables/Contraction/pt.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/si.ctb b/Tables/Contraction/si.ctb index b94b5237c67d84ef22b79a7b8c9624799bf2b413..7b9739b231f4ca0e82495c5839b67ca91387387c 100644 --- a/Tables/Contraction/si.ctb +++ b/Tables/Contraction/si.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/sw.ctb b/Tables/Contraction/sw.ctb index 4321870cd51f500cde64943bcff690fcf0eef2c0..e8949b703966ab6b585db6ec64c2c700b7130145 100644 --- a/Tables/Contraction/sw.ctb +++ b/Tables/Contraction/sw.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/th.ctb b/Tables/Contraction/th.ctb index 055edf8b81f4ea2e771577f274e76f93cf630fb9..aa0fa565716b5d42ad1a1beb19ce6de41e6037db 100644 --- a/Tables/Contraction/th.ctb +++ b/Tables/Contraction/th.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/zh-tw-ucb.ctb b/Tables/Contraction/zh-tw-ucb.ctb index 25c596e5b955783db9352ca19e35ebe4d3c2f5c3..8a299fb4e3ee6cfa0ec903505d04dbf1d561b1ee 100644 --- a/Tables/Contraction/zh-tw-ucb.ctb +++ b/Tables/Contraction/zh-tw-ucb.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/zh-tw.ctb b/Tables/Contraction/zh-tw.ctb index bfb721fbb6059cfb4802fdf711aa87ee8a804942..c24aa08a4d840ec9f3047c7e9ce426aae028e29e 100644 --- a/Tables/Contraction/zh-tw.ctb +++ b/Tables/Contraction/zh-tw.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,12 +16,13 @@ # This software is maintained by Dave Mielke . ############################################################################### -# BRLTTY Contraction Table - Chinese (Taiwan, uncontracted) by Coscell Kao (2015) +# BRLTTY Contraction Table - Chinese (Taiwan, uncontracted) by Coscell Kao (2016-5) #English characters include nabcc.cti #Unicode symbols +always \u00EF 4-24 always \u00A0 0 always \u00A1 34-2346 always \u00A2 36-14-36 @@ -249,12 +250,12 @@ always \u21E8 1246-25-25-135 always \u2200 256-1-123-123 always \u2201 14-135-134-1234-123 always \u2202 1234-14 -always \u2203 2345-15 +always \u2203 4-26 always \u2204 2345-1345-15 always \u2205 456-356 always \u2206 24-1345-13 always \u2207 46-1246 -always \u2208 15-123-134 +always \u2208 4-15 always \u2209 1345-15-123-134 always \u220A 234-15-123-134 always \u220B 134-15-134-12 @@ -280,16 +281,17 @@ always \u2223 1256 always \u2224 34-46-16 always \u2225 1246-123 always \u2226 34-1246-123 -always \u2227 46-1237 -always \u2228 12367 +always \u2227 4-146 +always \u2228 4-346 always \u2229 46-146 always \u222A 46-346 always \u222B 23467-2368 always \u222E 23467-1468 always \u2234 6-16 always \u2235 4-34 -always \u2236 156 +always \u2236 5-2 always \u2237 1234-1235-135-1234 +always \u223C 4-156-4-156 always \u2245 5-123456-126-156-12456 always \u224C 4-156-123456 always \u2251 123456 @@ -306,10 +308,12 @@ always \u2272 126-123456 always \u2273 345-123456 always \u2276 126-345 always \u2277 345-126 -always \u2282 234-136-12-234 -always \u2283 234-136-1234-234 +always \u2282 456-5-13 +always \u2283 456-46-2 always \u2286 234-136-12-234-123456 always \u2287 234-136-1234-234-123456 +always \u2295 1246-14-456-1246-346-12456 +always \u2296 1246-14-456-1246-36-12456 always \u22A5 1246-1234 always \u22BF 1246-2345 always \u22DC 123456-126 @@ -8239,7 +8243,7 @@ always \u563D 124-1236-3 always \u563E 124-1236-2 always \u563F 1235-356-3 always \u5640 15-256-5 -always \u5641 34-5 +always \u5641 2346-4 always \u5642 125-123456-4 always \u5643 12345-1236-3 always \u5644 12-156-3 @@ -8287,7 +8291,7 @@ always \u566D 13-246-5 always \u566E 45-5 always \u566F 2456-5 always \u5670 235-3 -always \u5671 15-236-2 +always \u5671 15-236-3 always \u5672 123-2356-5 always \u5673 1256-4 always \u5674 1234-136-3 @@ -8366,7 +8370,7 @@ always \u56BC 13-236-2 always \u56BD 12-25-5 always \u56BE 1235-12456-3 always \u56BF 1235-25-5 -always \u56C0 1-12456-5 +always \u56C0 1-12456-4 always \u56C1 1345-346-5 always \u56C2 15-246-3 always \u56C3 245-345-5 @@ -8475,7 +8479,7 @@ always \u5729 15-1256-3 always \u572A 13-2346-3 always \u572B 1256-5 always \u572C 34-3 -always \u572D 13-1246-3 +always \u572D 13-1246-5 always \u572E 1234-16-4 always \u572F 16-2 always \u5730 145-16-5 @@ -9066,7 +9070,7 @@ always \u5978 13-2345-3 always \u5979 1248-345-3 always \u597A 13-234-4 always \u597B 1345-1236-2 -always \u597C 12-345-4 +always \u597C 12-345-5 always \u597D 1235-146-4 always \u597E 15-2345-3 always \u597F 12345-1236-5 @@ -9769,7 +9773,7 @@ always \u5C37 13-1236-3 always \u5C38 24-156-3 always \u5C39 1456-4 always \u5C3A 12-156-4 -always \u5C3B 123-146-3 +always \u5C3B 123-146-4 always \u5C3C 1345-16-2 always \u5C3D 13-1456-4 always \u5C3E 1246-4 @@ -10002,7 +10006,7 @@ always \u5D20 145-12346-3 always \u5D21 1235-1236-2 always \u5D22 1-1356-3 always \u5D23 1246-4 -always \u5D24 15-246-2 +always \u5D24 146-2 always \u5D25 1234-16-4 always \u5D26 2345-3 always \u5D27 15-12346-3 @@ -10018,7 +10022,7 @@ always \u5D30 125-156-3 always \u5D31 125-2346-2 always \u5D32 1235-456-2 always \u5D33 1256-2 -always \u5D34 12456-4 +always \u5D34 1246-3 always \u5D35 46-2 always \u5D36 12345-1356-3 always \u5D37 245-234-2 @@ -10171,7 +10175,7 @@ always \u5DC9 12-1236-2 always \u5DCA 13456-4 always \u5DCB 123-1246-3 always \u5DCC 2345-2 -always \u5DCD 1246-3 +always \u5DCD 1246-2 always \u5DCE 1345-146-2 always \u5DCF 245-45-2 always \u5DD0 12-146-4 @@ -10550,7 +10554,7 @@ always \u5F44 123-12356-3 always \u5F45 13-2345-4 always \u5F46 135-346-5 always \u5F47 15-246-3 -always \u5F48 145-1236-5 +always \u5F48 124-1236-2 always \u5F49 1235-25-5 always \u5F4A 245-46-2 always \u5F4B 1235-12346-2 @@ -11461,9 +11465,9 @@ always \u62D3 124-25-5 always \u62D4 135-345-2 always \u62D5 124-25-3 always \u62D6 124-25-3 -always \u62D7 134-234-5 +always \u62D7 1345-234-5 always \u62D8 13-1256-3 -always \u62D9 1-25-3 +always \u62D9 1-25-2 always \u62DA 1234-1456-3 always \u62DB 1-146-3 always \u62DC 135-2456-5 @@ -11674,7 +11678,7 @@ always \u63A8 124-1246-3 always \u63A9 2345-4 always \u63AA 245-25-5 always \u63AB 125-12356-3 -always \u63AC 13-1256-3 +always \u63AC 13-1256-2 always \u63AD 124-2345-5 always \u63AE 245-2345-2 always \u63AF 123-136-5 @@ -11952,7 +11956,7 @@ always \u64BE 25-3 always \u64BF 13-2345-4 always \u64C0 13-1236-4 always \u64C1 235-4 -always \u64C2 14-356-5 +always \u64C2 14-356-2 always \u64C3 123-25-4 always \u64C4 14-34-4 always \u64C5 24-1236-5 @@ -12144,7 +12148,7 @@ always \u657E 24-1236-5 always \u657F 13-246-4 always \u6580 1-25-2 always \u6581 16-5 -always \u6582 14-2345-4 +always \u6582 14-2345-5 always \u6583 135-16-5 always \u6584 14-16-5 always \u6585 15-246-5 @@ -12596,7 +12600,7 @@ always \u6742 125-345-2 always \u6743 245-45-2 always \u6744 245-2345-3 always \u6745 1256-2 -always \u6746 13-1236-4 +always \u6746 13-1236-3 always \u6747 34-3 always \u6748 12-345-5 always \u6749 24-1236-3 @@ -13350,7 +13354,7 @@ always \u6A34 1-156-2 always \u6A35 245-246-2 always \u6A36 125-1246-3 always \u6A37 245-12346-2 -always \u6A38 1234-34-4 +always \u6A38 1234-34-2 always \u6A39 24-34-5 always \u6A3A 1235-35-5 always \u6A3B 123-1246-5 @@ -13450,7 +13454,7 @@ always \u6A98 135-16-5 always \u6A99 145-13456-4 always \u6A9A 12-34-4 always \u6A9B 1-35-3 -always \u6A9C 1235-1246-5 +always \u6A9C 123-2356-5 always \u6A9D 13-16-2 always \u6A9E 13-346-4 always \u6A9F 13-23456-4 @@ -15114,7 +15118,7 @@ always \u7118 145-146-5 always \u7119 135-356-5 always \u711A 12345-136-2 always \u711B 14-1456-5 -always \u711C 1235-123456-3 +always \u711C 123-123456-3 always \u711D 1235-123456-5 always \u711E 124-123456-3 always \u711F 15-16-2 @@ -15919,7 +15923,7 @@ always \u743D 145-34-4 always \u743E 13-346-5 always \u743F 1235-1246-3 always \u7440 1256-4 -always \u7441 134-156-5 +always \u7441 134-356-5 always \u7442 134-356-2 always \u7443 12-123456-3 always \u7444 15-45-3 @@ -16474,7 +16478,7 @@ always \u7668 1235-25-5 always \u7669 14-2456-5 always \u766A 13-16-3 always \u766B 145-2345-3 -always \u766C 15-45-4 +always \u766C 15-2345-4 always \u766D 13456-4 always \u766E 1456-4 always \u766F 245-1256-2 @@ -16875,7 +16879,7 @@ always \u77F9 34-5 always \u77FA 1-2346-2 always \u77FB 123-34-5 always \u77FC 13-46-3 -always \u77FD 15-16-3 +always \u77FD 15-16-5 always \u77FE 12345-1236-2 always \u77FF 123-456-5 always \u7800 145-1346-5 @@ -16909,7 +16913,7 @@ always \u781B 13-1456-3 always \u781C 12345-1356-3 always \u781D 12345-345-4 always \u781E 134-126-5 -always \u781F 1-345-5 +always \u781F 1-345-3 always \u7820 245-1256-3 always \u7821 1256-5 always \u7822 14-25-4 @@ -17742,7 +17746,7 @@ always \u7B5C 145-1346-3 always \u7B5D 1-1356-3 always \u7B5E 245-2346-5 always \u7B5F 12345-34-3 -always \u7B60 256-3 +always \u7B60 256-2 always \u7B61 124-34-2 always \u7B62 1234-345-2 always \u7B63 14-16-2 @@ -18379,7 +18383,7 @@ always \u7DD9 123-2346-5 always \u7DDA 15-2345-5 always \u7DDB 1245-12456-4 always \u7DDC 134-2345-2 -always \u7DDD 13-16-3 +always \u7DDD 245-16-5 always \u7DDE 145-12456-5 always \u7DDF 1-12346-5 always \u7DE0 145-16-5 @@ -18466,7 +18470,7 @@ always \u7E30 15-16-4 always \u7E31 125-12346-5 always \u7E32 14-356-2 always \u7E33 1-12456-5 -always \u7E34 15-2345-3 +always \u7E34 245-2345-5 always \u7E35 134-1236-5 always \u7E36 1-156-2 always \u7E37 14-1256-4 @@ -18809,7 +18813,7 @@ always \u7F87 13-16-3 always \u7F88 13-16-3 always \u7F89 14-12456-2 always \u7F8A 46-2 -always \u7F8B 134-16-4 +always \u7F8B 134-346-3 always \u7F8C 245-46-3 always \u7F8D 124-345-5 always \u7F8E 134-356-4 @@ -19496,7 +19500,7 @@ always \u8236 135-126-2 always \u8237 15-2345-2 always \u8238 13-2346-4 always \u8239 12-12456-2 -always \u823A 15-23456-2 +always \u823A 13-23456-4 always \u823B 14-34-2 always \u823C 245-235-2 always \u823D 1234-1346-2 @@ -20152,7 +20156,7 @@ always \u84C6 15-16-2 always \u84C7 13-34-4 always \u84C8 14-1346-2 always \u84C9 1245-12346-2 -always \u84CA 12346-3 +always \u84CA 12346-4 always \u84CB 13-2456-5 always \u84CC 245-25-5 always \u84CD 24-156-3 @@ -20724,7 +20728,7 @@ always \u8702 12345-1356-3 always \u8703 24-136-5 always \u8704 1-136-5 always \u8705 12345-34-4 -always \u8706 15-45-4 +always \u8706 15-2345-4 always \u8707 1-2346-2 always \u8708 34-2 always \u8709 12345-34-2 @@ -22634,7 +22638,7 @@ always \u8E78 14-1456-5 always \u8E79 124-345-5 always \u8E7A 245-246-3 always \u8E7B 245-246-2 -always \u8E7C 1234-34-4 +always \u8E7C 1234-34-2 always \u8E7D 14-246-3 always \u8E7E 145-123456-3 always \u8E7F 245-12456-3 @@ -23352,7 +23356,7 @@ always \u9146 12345-1356-3 always \u9147 125-1236-5 always \u9148 14-16-5 always \u9149 234-4 -always \u914A 145-13456-3 +always \u914A 145-13456-4 always \u914B 245-234-2 always \u914C 1-25-2 always \u914D 1234-356-5 @@ -23589,7 +23593,7 @@ always \u9233 123-2346-3 always \u9234 14-13456-2 always \u9235 135-13456-5 always \u9236 15-156-5 -always \u9237 13-34-4 +always \u9237 13-34-3 always \u9238 135-126-2 always \u9239 1234-16-2 always \u923A 1256-5 @@ -24974,7 +24978,7 @@ always \u979C 124-345-5 always \u979D 24-1346-5 always \u979E 135-13456-4 always \u979F 123-25-5 -always \u97A0 13-1256-3 +always \u97A0 13-1256-2 always \u97A1 14-345-3 always \u97A2 15-346-5 always \u97A3 1245-12356-2 @@ -27028,6 +27032,10 @@ always \u9FA2 1235-2346-2 always \u9FA3 13-236-2 always \u9FA4 15-346-2 always \u9FA5 1256-5 +always \uE18C 12356-17-23456 +always \uE18D 12356-127-23456 +always \uE18E 12356-147-23456 +always \uE18F 12356-1457-23456 always \uF900 245-16-4 always \uF901 13-1356-5 always \uF902 12-2346-3 @@ -27597,7 +27605,7 @@ always \uFF3A 13567-0 always \uFF3B 2467-0 always \uFF3C 12567-0 always \uFF3D 124567-0 -always \uFF3E 1456 +always \uFF3F 456-0 always \uFF40 4-0 always \uFF41 1-0 always \uFF42 12-0 @@ -27953,7 +27961,6 @@ always \u5614\u5410 12356-4-124-34-5 always \u5614\u6c23 12356-5-245-16-5 always \u5629\u5566 1235-35-3-14-345-3 always \u5630\u54e9 13-16-3-14-16-3 -always \u5641\u5fc3 2346-4-15-1456-3 always \u5668\u6a02 245-16-5-236-5 always \u5687\u963b 1235-2346-5-125-34-4 always \u56db\u884c 15-156-5-1235-1346-2 @@ -27995,7 +28002,6 @@ always \u5916\u76f8 2356-5-15-46-5 always \u5916\u884c 2356-5-1235-1346-2 always \u5916\u9577 2356-5-1-1346-4 always \u591a\u91cd 145-25-3-12-12346-2 -always \u5922\u9b58 134-1356-5-346-5 always \u5927\u5b9b 145-345-5-45-3 always \u5927\u5c07 145-345-5-13-46-5 always \u5927\u7387 145-345-5-24-2356-5 @@ -28140,8 +28146,6 @@ always \u5f37\u5e79 245-46-4-13-1236-5 always \u5f37\u6a6b 245-46-2-1235-1356-5 always \u5f37\u6c42 245-46-4-245-234-2 always \u5f37\u8a18 245-46-4-13-16-5 -always \u5F48\u6027 124-1236-2-15-13456-5 -always \u5F48\u7C27 124-1236-2-1235-456-2 always \u5f4c\u6492 134-16-2-15-345-3 always \u5f4e\u66f2 12456-3-245-1256-3 always \u5f71\u5b50 13456-4-125-156-1 @@ -28233,7 +28237,7 @@ always \u62b9\u715e 134-126-4-24-345-3 always \u62bd\u7a7a 12-12356-3-123-12346-5 always \u62cd\u5b50 1234-2456-3-125-156-1 always \u62d4\u90fd 135-345-2-145-34-3 -always \u62d7\u53e3 246-5-123-12356-4 +always \u62d7\u53e3 146-5-123-12356-4 always \u62d8\u6ce5 13-1256-3-1345-16-5 always \u62d9\u8457 1-25-2-1-34-5 always \u6307\u6458 1-156-4-1-2346-2 @@ -28621,7 +28625,6 @@ always \u738b\u51a0 456-2-13-12456-3 always \u738b\u90fd 456-2-145-34-3 always \u73a9\u5473 12456-5-1246-5 always \u73a9\u5ffd 12456-5-1235-34-3 -always \u73a9\u6cd5 12456-5-12345-345-4 always \u73e0\u5b50 1-34-3-125-156-1 always \u73ed\u5b50 135-1236-3-125-156-1 always \u73ed\u9577 135-1236-3-1-1346-4 diff --git a/Tables/Contraction/zu.ctb b/Tables/Contraction/zu.ctb index 61cc3d380c480cc7d1fd48ebf1c4ceff4b482915..0d72529edd86345c6ebfc9c671fba8fabca05442 100644 --- a/Tables/Contraction/zu.ctb +++ b/Tables/Contraction/zu.ctb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/abt_basic.kti b/Tables/Input/al/abt_basic.kti index 05f7c1993ea9053863602ec82b751493f4d08148..6caeb54f7bf0f415e9941a35b9e080bd6c237998 100644 --- a/Tables/Input/al/abt_basic.kti +++ b/Tables/Input/al/abt_basic.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/abt_extra.kti b/Tables/Input/al/abt_extra.kti index 13bb6d6282d6fc63bfa0782f63f98f4de3008e18..fbb88b44fa0ca53f94771a37c90ff3b57b886247 100644 --- a/Tables/Input/al/abt_extra.kti +++ b/Tables/Input/al/abt_extra.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/abt_large.ktb b/Tables/Input/al/abt_large.ktb index 424215dc098f89f91e5f0b9a61bfc6b24ada3ef8..f69fa78fc1018ed1f1dd0bc8fcec20d54a049392 100644 --- a/Tables/Input/al/abt_large.ktb +++ b/Tables/Input/al/abt_large.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/abt_small.ktb b/Tables/Input/al/abt_small.ktb index f7664a9ccd1c09d6dc65a5e42d6147d240c0dbd6..662a96b9c5d611ca4d4afc155dd48575b82151f9 100644 --- a/Tables/Input/al/abt_small.ktb +++ b/Tables/Input/al/abt_small.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc-etouch.kti b/Tables/Input/al/bc-etouch.kti index 6bbf43ec8afbe0537f5357d1527835439ca16bad..99e83794b4b81dfaf91e842b6d43f20e52425721 100644 --- a/Tables/Input/al/bc-etouch.kti +++ b/Tables/Input/al/bc-etouch.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc-smartpad.kti b/Tables/Input/al/bc-smartpad.kti index c18357dfa9ec7c9d72ba2c041c0e3851597850fe..23f81030fed02783da0e6977747cc686867578d9 100644 --- a/Tables/Input/al/bc-smartpad.kti +++ b/Tables/Input/al/bc-smartpad.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc-thumb.kti b/Tables/Input/al/bc-thumb.kti index a3798f72c609f33a9db6228b5972a06d0afafa21..4ae7a30dfa55a9392c65759a8f9882f27f82b3a0 100644 --- a/Tables/Input/al/bc-thumb.kti +++ b/Tables/Input/al/bc-thumb.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc.kti b/Tables/Input/al/bc.kti index 68ac8c564918cce424bda825d1c7b634a23188bb..5c6bf6f89abe5c356c565def00089ee53792b55b 100644 --- a/Tables/Input/al/bc.kti +++ b/Tables/Input/al/bc.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc640.ktb b/Tables/Input/al/bc640.ktb index cf82554261eb21c249d08ba21c5f57a87bd34450..80753177af31ce6843859eda85bcd1c0142740ce 100644 --- a/Tables/Input/al/bc640.ktb +++ b/Tables/Input/al/bc640.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc680.ktb b/Tables/Input/al/bc680.ktb index 7e31fe004022c4d89a459717ef45796354e18e5b..5d7f7f0c663154c395d49b1f00714b6017d1ef28 100644 --- a/Tables/Input/al/bc680.ktb +++ b/Tables/Input/al/bc680.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/el.ktb b/Tables/Input/al/el.ktb index 17428e724fa35fedc3f29bc5a4577bea821af787..ac245d6e51193963ba95b333f4a0384369e2f616 100644 --- a/Tables/Input/al/el.ktb +++ b/Tables/Input/al/el.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_basic.kti b/Tables/Input/al/sat_basic.kti index 52accba13f2ccf36d56df6477a00a4ca54b85b23..08c38f7cde61f49f8c9c0465c20b89bdeaef86dd 100644 --- a/Tables/Input/al/sat_basic.kti +++ b/Tables/Input/al/sat_basic.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_extra.kti b/Tables/Input/al/sat_extra.kti index 788bb6dfe6cd450800029a96d1707c60741487e0..045b9c985dd8fcafb88ae7b163089ca563e5b3fb 100644 --- a/Tables/Input/al/sat_extra.kti +++ b/Tables/Input/al/sat_extra.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_large.ktb b/Tables/Input/al/sat_large.ktb index 6102bd606e0de375e7918869c7bd5eceebaa3da8..c7c9a08508ad115298864c064bd35b687ed1f0f6 100644 --- a/Tables/Input/al/sat_large.ktb +++ b/Tables/Input/al/sat_large.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_small.ktb b/Tables/Input/al/sat_small.ktb index d8486260dac53208e78dd070c8b4772e85f6803c..f9a0678ff2b3c4df866019bb3dab6f0f7380aba1 100644 --- a/Tables/Input/al/sat_small.ktb +++ b/Tables/Input/al/sat_small.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/voyager.ktb b/Tables/Input/al/voyager.ktb index 65f797fe5b9536d21a58867db2ca4ef21ea8ebc3..3566deb0ae2a90874d2523a78ff59a3447045717 100644 --- a/Tables/Input/al/voyager.ktb +++ b/Tables/Input/al/voyager.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/at/all.ktb b/Tables/Input/at/all.ktb index 352a3be26cd8b856544c7aef752765328856f06d..b8ef7849822527839331e15fe8b86363ed91a95a 100644 --- a/Tables/Input/at/all.ktb +++ b/Tables/Input/at/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bg/all.ktb b/Tables/Input/bg/all.ktb index 6e49df14d470cdfefaffcd00274e6922d5daf78b..a88345519139a318264310409c892b73ab3df853 100644 --- a/Tables/Input/bg/all.ktb +++ b/Tables/Input/bg/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/b9b10.kti b/Tables/Input/bm/b9b10.kti index 66b11d05e742af97a0e83c4851a8aeec018df0d0..ed8c9c70d9453f2ef3a0d0a71e5f3783751b9057 100644 --- a/Tables/Input/bm/b9b10.kti +++ b/Tables/Input/bm/b9b10.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -21,3 +21,4 @@ note B9 and B10 are the keys immediately to the left and right of the joystick. bind B9 KEY_BACKSPACE assign space B10 include keyboard.kti +bind B9+RoutingKey SETLEFT diff --git a/Tables/Input/bm/b9b11b10.kti b/Tables/Input/bm/b9b11b10.kti index 5a48aebf5898cc296c76982e3ae333477164386a..24e2bb78f771f9bc77c71627a8243011b04a8512 100644 --- a/Tables/Input/bm/b9b11b10.kti +++ b/Tables/Input/bm/b9b11b10.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -23,5 +23,16 @@ note * then they become the Dot7 and Dot8 keys. note B11 is the key between the Dot1 and Dot4 keys. bind B9 KEY_BACKSPACE +bind B10 KEY_ENTER + assign space B11 include keyboard.kti +bind B9+RoutingKey SETLEFT +bind B10+RoutingKey SWITCHVT + +bind B11+Up TOP +bind B11+Down BOT +bind B11+Left FWINLTSKIP +bind B11+Right FWINRTSKIP +bind B11+Press PASTE + diff --git a/Tables/Input/bm/command.kti b/Tables/Input/bm/command.kti index 2e4ee1b10b394b5cc17d72344bc41fe4142794de..5e6688145434fc1500c68a418c8c9c93a7c09a2d 100644 --- a/Tables/Input/bm/command.kti +++ b/Tables/Input/bm/command.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/connect.ktb b/Tables/Input/bm/connect.ktb index 34c079671d66ec1fad84e4833e0b844042c18326..dd1713b82153daa42f5b6e5ac76fbb70e94b08b8 100644 --- a/Tables/Input/bm/connect.ktb +++ b/Tables/Input/bm/connect.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/conny.ktb b/Tables/Input/bm/conny.ktb index 52f97274b4358e962a0148dbd5000adf26797be8..8b9220c1c2a0e2006d51d0b0a572e6b2c17f8c58 100644 --- a/Tables/Input/bm/conny.ktb +++ b/Tables/Input/bm/conny.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/d6.kti b/Tables/Input/bm/d6.kti index ee4e215ecb85aa3f1be4c5da70570d8ca3e22ea7..ba1405b7e355ca1567cfea313f0ea487b955fe37 100644 --- a/Tables/Input/bm/d6.kti +++ b/Tables/Input/bm/d6.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/default.ktb b/Tables/Input/bm/default.ktb index c8a02ecb917902a76a860c2f0d761a0e4c6ae188..c46fde89cf74f4492369a3ff5bac362842fa6bfc 100644 --- a/Tables/Input/bm/default.ktb +++ b/Tables/Input/bm/default.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/display6.kti b/Tables/Input/bm/display6.kti index 1080fa52873381950342a1da792f7d38ba84b66d..443f47d56c22929af757fb1c4fc730c7254c22c5 100644 --- a/Tables/Input/bm/display6.kti +++ b/Tables/Input/bm/display6.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/display7.kti b/Tables/Input/bm/display7.kti index 983d1477edce40de38bd44f69034c3704ea56056..f6a4d78174fca3f2c55ea38f87a0460ac4214fc3 100644 --- a/Tables/Input/bm/display7.kti +++ b/Tables/Input/bm/display7.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/dm80p.ktb b/Tables/Input/bm/dm80p.ktb index cdb080aead61da0f1d67f7f8469662b2ef921546..fc3c79c6aea509b8a477b6f3396bf0f16f8c8db8 100644 --- a/Tables/Input/bm/dm80p.ktb +++ b/Tables/Input/bm/dm80p.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/front10.kti b/Tables/Input/bm/front10.kti index 034c2d2797b4280fcf06be906f74e6383e5d26d0..57f167be3cee280d44c758999f2c4b709c06d0e8 100644 --- a/Tables/Input/bm/front10.kti +++ b/Tables/Input/bm/front10.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/front6.kti b/Tables/Input/bm/front6.kti index 53b32432b742010b179403bea6654b37809847d9..f8b50f28d13531206b2dfa8fff677ff8eee9cc87 100644 --- a/Tables/Input/bm/front6.kti +++ b/Tables/Input/bm/front6.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/horizontal.kti b/Tables/Input/bm/horizontal.kti index 9d61a6d4373e4a80df15d9acfd4bc66df0784025..bb9393fd18443b139a0f655fe32d8ea4e59727a5 100644 --- a/Tables/Input/bm/horizontal.kti +++ b/Tables/Input/bm/horizontal.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/inka.ktb b/Tables/Input/bm/inka.ktb index f5f7f6714c0968444e0ec3c53c4023ced8b33abc..4ea8193e889c97a11502ea84a6f33a8735cedef3 100644 --- a/Tables/Input/bm/inka.ktb +++ b/Tables/Input/bm/inka.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/keyboard.kti b/Tables/Input/bm/keyboard.kti index 696ebb82ec5bf5eaba5440434fe65b907ad9de7a..2a1861cbbc3863a3346ee53898f6a2852f993709 100644 --- a/Tables/Input/bm/keyboard.kti +++ b/Tables/Input/bm/keyboard.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -30,6 +30,8 @@ map Dot8 DOT8 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 diff --git a/Tables/Input/bm/pro.ktb b/Tables/Input/bm/pro.ktb index 6a4120f4aff0a4a2a5c0602d945d81d7cee826e1..7a8d3c0c518e089b707a809326306e25c565b758 100644 --- a/Tables/Input/bm/pro.ktb +++ b/Tables/Input/bm/pro.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/pronto.ktb b/Tables/Input/bm/pronto.ktb index 2a7588d55be69a8abf7ada2a56d1e719a9ad69bd..b98ca7e33bc847aedbc2bdf439870791a1e61e7e 100644 --- a/Tables/Input/bm/pronto.ktb +++ b/Tables/Input/bm/pronto.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/pv.ktb b/Tables/Input/bm/pv.ktb index 1d48406e5c8f765501ddc1dd322f64ebf54ef402..7c48b11cf4a9a09cc6367678fdd87d80feb8e104 100644 --- a/Tables/Input/bm/pv.ktb +++ b/Tables/Input/bm/pv.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/rb.ktb b/Tables/Input/bm/rb.ktb index d5fbd89e058f748322d9b2e69d370063faf8b9ff..297d33e9717c863f9ae958f2f58370b14dbec504 100644 --- a/Tables/Input/bm/rb.ktb +++ b/Tables/Input/bm/rb.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/routing6.kti b/Tables/Input/bm/routing6.kti index ba0485813895ef1becd1d113a0c862387738b3a4..f6b6d0d6d3c209ddfa8368be9b30863b23627820 100644 --- a/Tables/Input/bm/routing6.kti +++ b/Tables/Input/bm/routing6.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/routing7.kti b/Tables/Input/bm/routing7.kti index 9ae2d3f21242123ee5d6269f31efd87082d6a6fd..cfccd07c97e78798e0cccbaea86865daa8c3a33f 100644 --- a/Tables/Input/bm/routing7.kti +++ b/Tables/Input/bm/routing7.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/status.kti b/Tables/Input/bm/status.kti index 0881abf0230b5760b19ba611fc0c873e39a04e71..a44364b1860473ffa439ef552daed685160c5984 100644 --- a/Tables/Input/bm/status.kti +++ b/Tables/Input/bm/status.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/sv.ktb b/Tables/Input/bm/sv.ktb index 382b2eabbe1662b3c2d0a187b44196831dbd9c0a..c160f1307d6f7f98a0dac47d793d789ec7750fa1 100644 --- a/Tables/Input/bm/sv.ktb +++ b/Tables/Input/bm/sv.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/ultra.ktb b/Tables/Input/bm/ultra.ktb index beb668f743e7d19b135a95e533033183dba4d0c8..904b857db3cfc2d2f4e78c9afc07471cbe715525 100644 --- a/Tables/Input/bm/ultra.ktb +++ b/Tables/Input/bm/ultra.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/v40.ktb b/Tables/Input/bm/v40.ktb index e7290a66a82e362c663a28d0d37bb976bcf9eb43..05c528da19a7bf6ddd7513715c60afdefce3c12c 100644 --- a/Tables/Input/bm/v40.ktb +++ b/Tables/Input/bm/v40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/v80.ktb b/Tables/Input/bm/v80.ktb index 435a76034ad949210a68da8da0dfd7f4ef91ef8b..1021a5587989d727514d3afaa50108cf6f8546fa 100644 --- a/Tables/Input/bm/v80.ktb +++ b/Tables/Input/bm/v80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/vertical.kti b/Tables/Input/bm/vertical.kti index 5bd4a63b89e963ce9bfca3bbe0caecde02ceca62..a5f82bb94d2ceec43a906e2a3f6b878116712d7e 100644 --- a/Tables/Input/bm/vertical.kti +++ b/Tables/Input/bm/vertical.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/vk.ktb b/Tables/Input/bm/vk.ktb index 02919ae6231f4159e410991d03a93ae4789c4a80..283878f4c7251660d7bc97c8429eda74dec37f9b 100644 --- a/Tables/Input/bm/vk.ktb +++ b/Tables/Input/bm/vk.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/wheels.kti b/Tables/Input/bm/wheels.kti index 16d9c63ae275aaa344139a28e23c9e960534ed21..fc146b42ae0d0f5a450b73bc1e719f5e5664f2ef 100644 --- a/Tables/Input/bm/wheels.kti +++ b/Tables/Input/bm/wheels.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bn/all.ktb b/Tables/Input/bn/all.ktb index 7c42ee83209e61aa7778adffad06733c3e1c61be..507ef08ae3f0329f4cb888ed05768fd7cf79e390 100644 --- a/Tables/Input/bn/all.ktb +++ b/Tables/Input/bn/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bn/input.kti b/Tables/Input/bn/input.kti index a3f6ac3ab2a97347196f5b2b4b7b759d590ecc6a..fe5046b27938ff87eb97d636133bad674da30d52 100644 --- a/Tables/Input/bn/input.kti +++ b/Tables/Input/bn/input.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bp/all.kti b/Tables/Input/bp/all.kti index 374b1172017a07322f9ddae397ea6dcca0f92b36..3fef4dbde329517da8bc4826e20190103264f359 100644 --- a/Tables/Input/bp/all.kti +++ b/Tables/Input/bp/all.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/cb/all.ktb b/Tables/Input/cb/all.ktb index 83ab2aee3f8693f463e359f370d8dd2b0baca7e9..5ca8b00dede7b6b8e0b1e0f7d9a90a3cfd18b60c 100644 --- a/Tables/Input/cb/all.ktb +++ b/Tables/Input/cb/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ce/all.ktb b/Tables/Input/ce/all.ktb index 026c00d5af7d7d789224a52a102d6d6948912640..bbb6d494ea123903ca6a0c92ad907fe668e3898c 100644 --- a/Tables/Input/ce/all.ktb +++ b/Tables/Input/ce/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ce/novem.ktb b/Tables/Input/ce/novem.ktb index 3cd207bd2a720339d34bafdbde41ca097b2ad929..bc18cc5ccea98b6acb1bd0da3820fa49e693288b 100644 --- a/Tables/Input/ce/novem.ktb +++ b/Tables/Input/ce/novem.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/chords.kti b/Tables/Input/chords.kti index a63e07de470b3fd55d4c7f997cc3242c7fda06b2..a72193498b3950a55bfcedbfe2113b501a8b1577 100644 --- a/Tables/Input/chords.kti +++ b/Tables/Input/chords.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/braille.kti b/Tables/Input/eu/braille.kti index 1cf36dfe9e414a8e1c1abc8203e9a1825460e604..8f5c4d24c7021a68ca8ca6668075a1a8e2857abc 100644 --- a/Tables/Input/eu/braille.kti +++ b/Tables/Input/eu/braille.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/clio.ktb b/Tables/Input/eu/clio.ktb index d861927c3b89b36f0a9296aeb5f3daaf88ee3343..845f38fe10b4783410a8b95bc9e9350e8f480676 100644 --- a/Tables/Input/eu/clio.ktb +++ b/Tables/Input/eu/clio.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/common.kti b/Tables/Input/eu/common.kti index 6bb7502c2ba4be6eb2cde8b9cf9931e9f138259f..8446f27dc22d7bed1221fe6f60fb3e968eda7cee 100644 --- a/Tables/Input/eu/common.kti +++ b/Tables/Input/eu/common.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/esys_large.ktb b/Tables/Input/eu/esys_large.ktb index 5fc5ad6cebf25d634917aed2e1d702a4161123d0..ba342492a792befd5acf97427033374075f107cb 100644 --- a/Tables/Input/eu/esys_large.ktb +++ b/Tables/Input/eu/esys_large.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/esys_medium.ktb b/Tables/Input/eu/esys_medium.ktb index 1062ffaf5aa91fe92fc9db7e6fc1cbe8cde11847..fd3e0531a498645ee19bb49b9eb8cfaaf730bdc8 100644 --- a/Tables/Input/eu/esys_medium.ktb +++ b/Tables/Input/eu/esys_medium.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/esys_small.ktb b/Tables/Input/eu/esys_small.ktb index e96fff146e67769c3c49bccd0a1c1ae67d2ff6e3..76c0706c5d794f6c45c9e4ecb2ba2284635aaf34 100644 --- a/Tables/Input/eu/esys_small.ktb +++ b/Tables/Input/eu/esys_small.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/esytime.ktb b/Tables/Input/eu/esytime.ktb index 197804bd6ec30623439a6ccd4a30c54a39ed7f6c..71a431e73a35d7bc4118554ac52256ac7489fe17 100644 --- a/Tables/Input/eu/esytime.ktb +++ b/Tables/Input/eu/esytime.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/iris.ktb b/Tables/Input/eu/iris.ktb index 2b387616786254ddd1dc2dc7e3e0e98a8c0c61a9..a2ba7370571e43275d5d2b7b7e405e0ef8a0821a 100644 --- a/Tables/Input/eu/iris.ktb +++ b/Tables/Input/eu/iris.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/joysticks.kti b/Tables/Input/eu/joysticks.kti index a420442c0b4684baab50bf35cb53aed7a2a67f15..ae5145d861a9b778220eb8c0df8b7f9652f6d353 100644 --- a/Tables/Input/eu/joysticks.kti +++ b/Tables/Input/eu/joysticks.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/sw12.kti b/Tables/Input/eu/sw12.kti index a1c2b4951c4068d198692b81b79cb614277051a9..be3ad79aacd3be232240a9e8e50ab684850785e6 100644 --- a/Tables/Input/eu/sw12.kti +++ b/Tables/Input/eu/sw12.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/sw34.kti b/Tables/Input/eu/sw34.kti index 31c20ba6f472b42450f077dcba4425737db898ea..c084dd9f4c74bd940d30692ffed5487a2da6deae 100644 --- a/Tables/Input/eu/sw34.kti +++ b/Tables/Input/eu/sw34.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/eu/sw56.kti b/Tables/Input/eu/sw56.kti index 6ee56ae58c13be384a82b328fded8bb9d5d90e01..ca8478fd3f5955c1a2c313426fbf041e0ae2626c 100644 --- a/Tables/Input/eu/sw56.kti +++ b/Tables/Input/eu/sw56.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/bumpers.kti b/Tables/Input/fs/bumpers.kti index 9d4a5809860c65f157ae3c6458c184784ec0af88..bb168eb2d2c95713926c7e0e475390f79f62d375 100644 --- a/Tables/Input/fs/bumpers.kti +++ b/Tables/Input/fs/bumpers.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/common.kti b/Tables/Input/fs/common.kti index 0c075edfc54826b8bb5ca99621a880fcc5c7dffe..56c37f04cf552dfc463db5ecde8a77bb7e0120ed 100644 --- a/Tables/Input/fs/common.kti +++ b/Tables/Input/fs/common.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_basic.ktb b/Tables/Input/fs/focus_basic.ktb index 569d9eadba471b0b5f7b3ad5799c957e1f6f5108..19b06b91b367bcdfebcebfaf55119067a7d4a0ed 100644 --- a/Tables/Input/fs/focus_basic.ktb +++ b/Tables/Input/fs/focus_basic.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_basic.kti b/Tables/Input/fs/focus_basic.kti index 6e3ee4083158933e8bbda28feee1b4987c534d7f..068db785bc2e154707d016956863d09ef6674aee 100644 --- a/Tables/Input/fs/focus_basic.kti +++ b/Tables/Input/fs/focus_basic.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_large.ktb b/Tables/Input/fs/focus_large.ktb index 0303bee6390d1d7b51c7959a6826c88320309fa8..76019bc2f8ff0eb5a1c53b91cb3b51c80f4c03e9 100644 --- a/Tables/Input/fs/focus_large.ktb +++ b/Tables/Input/fs/focus_large.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_small.ktb b/Tables/Input/fs/focus_small.ktb index c730a318384bd95472e0cf96809cc4e7177a516b..3dd7636aa098c0e736e0fd4442e32923512b2dee 100644 --- a/Tables/Input/fs/focus_small.ktb +++ b/Tables/Input/fs/focus_small.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/pacmate.ktb b/Tables/Input/fs/pacmate.ktb index a2fce73a3c1099cb93c252f8f7b3291e69db4b19..d848090fa1a26a3e013ba168cfc45aefbc81e11c 100644 --- a/Tables/Input/fs/pacmate.ktb +++ b/Tables/Input/fs/pacmate.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/rockers.kti b/Tables/Input/fs/rockers.kti index 44db631610c820067af27e595c2983e758077547..75eebb204a4073b0e475eaf0e863c4de21ab6c9c 100644 --- a/Tables/Input/fs/rockers.kti +++ b/Tables/Input/fs/rockers.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hd/mbl.ktb b/Tables/Input/hd/mbl.ktb index cfeee83fcc21357d38283dc238e25097216c2e71..4e41eb513d09106ea66b0af51ee8e17ac63bbc2e 100644 --- a/Tables/Input/hd/mbl.ktb +++ b/Tables/Input/hd/mbl.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hd/pfl.ktb b/Tables/Input/hd/pfl.ktb index 0384c7e91f8360e9cfde2a070dbed4fbadfe55d7..06e60bad900d2dc165b5e7644c27b42eff305453 100644 --- a/Tables/Input/hd/pfl.ktb +++ b/Tables/Input/hd/pfl.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/beetle.ktb b/Tables/Input/hm/beetle.ktb new file mode 100644 index 0000000000000000000000000000000000000000..6873ddc272a7e02e59facb4f4c05a8459c481504 --- /dev/null +++ b/Tables/Input/hm/beetle.ktb @@ -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-2016 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 HIMS Smart Beetle + +include common.kti +include braille.kti +include f14.kti +include pan.kti diff --git a/Tables/Input/hm/braille.kti b/Tables/Input/hm/braille.kti index 7c686c8fda819bcc4981d30d4a0f750ddcac367b..647300d6ddd730902d0f02d7f6b9e9a7097a7c42 100644 --- a/Tables/Input/hm/braille.kti +++ b/Tables/Input/hm/braille.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/common.kti b/Tables/Input/hm/common.kti index cf67ff20a70ab6072a4ca96bda9addf9ab5b2e52..00ee0af0e2a0aaa82adfbb42fda08816d6739174 100644 --- a/Tables/Input/hm/common.kti +++ b/Tables/Input/hm/common.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/contexts.kti b/Tables/Input/hm/contexts.kti index 4e429a6cb6218f9d4d850af96ea5af76b2746e13..440ba8df443e80a18d5660f985148d55e5247049 100644 --- a/Tables/Input/hm/contexts.kti +++ b/Tables/Input/hm/contexts.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/edge.ktb b/Tables/Input/hm/edge.ktb index e1d8c056311350796bc3fc1e9aa43f6dd6afeb1d..4762728333bb420585edbcc32a6de9514141f653 100644 --- a/Tables/Input/hm/edge.ktb +++ b/Tables/Input/hm/edge.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/f14.kti b/Tables/Input/hm/f14.kti index 9d8dbf0bd8e505123bc0c42a5c778fb9b5c1da6f..f833471d1d9ef626ee346eb1f2db529465aeb293 100644 --- a/Tables/Input/hm/f14.kti +++ b/Tables/Input/hm/f14.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/f18.kti b/Tables/Input/hm/f18.kti index 7e4c8596eed7b004890c8af7fefc52aac0b6d2bc..c8b6139f39d27f8f2d09624aff166a70c9ec9950 100644 --- a/Tables/Input/hm/f18.kti +++ b/Tables/Input/hm/f18.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/fnkey.kti b/Tables/Input/hm/fnkey.kti index a84bec21f4ea93f5adf0b40c6b66b2661d09de66..af5780d347ca6e61421422af5aea5515e4b84ebe 100644 --- a/Tables/Input/hm/fnkey.kti +++ b/Tables/Input/hm/fnkey.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/left.kti b/Tables/Input/hm/left.kti index e9b4f324a50eda3659ac0b6b2631f94c5203bb5e..ef98d9f75691c743f10dcb1215bad28d911e5e4d 100644 --- a/Tables/Input/hm/left.kti +++ b/Tables/Input/hm/left.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/letters.kti b/Tables/Input/hm/letters.kti index 4baef6f7151bbcad57a263d0616152a19725abd7..e15f2d21ccc857201c31b78a359d6eb82059a2e8 100644 --- a/Tables/Input/hm/letters.kti +++ b/Tables/Input/hm/letters.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/pan.ktb b/Tables/Input/hm/pan.ktb index e17b15838fcb87553df4a6d983835e1ea47b40f9..faae7aacdfc94a8de01d2fd4324b1ccf7e1e15ae 100644 --- a/Tables/Input/hm/pan.ktb +++ b/Tables/Input/hm/pan.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/pan.kti b/Tables/Input/hm/pan.kti index 3f5e4beb87e0df34f09bc8e708fa129e8b61848d..3366b63ef0e71b52ebe7ed30e8dc77b85237ef96 100644 --- a/Tables/Input/hm/pan.kti +++ b/Tables/Input/hm/pan.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/qwerty.ktb b/Tables/Input/hm/qwerty.ktb index 3781c7242b93cb02f80f37258a42ab207a543804..9c9e4ff308318dfd4ac4ad8138c6973f79b2f562 100644 --- a/Tables/Input/hm/qwerty.ktb +++ b/Tables/Input/hm/qwerty.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/qwerty.kti b/Tables/Input/hm/qwerty.kti index 944d6c4ccf25890bb2699c3e767eaca80efb0398..6aee39a83af71a907f44c53a5d84930296f1d436 100644 --- a/Tables/Input/hm/qwerty.kti +++ b/Tables/Input/hm/qwerty.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -84,8 +84,8 @@ bind F1+Dot2+Dot7 KEY_CURSOR_LEFT+shift+meta bind F1+Dot5+Dot7 KEY_CURSOR_RIGHT+shift+meta bind Space+Dot1+Dot2+Dot5 KEY_FUNCTION+0 -bind Space+Dot1+Dot2 KEY_FUNCTION+1 -bind Dot1+Dot2+Dot4+Dot8 KEY_FUNCTION+2 +bind F4+Space+Dot1+Dot2 KEY_FUNCTION+1 +bind F4+Dot1+Dot2+Dot4+Dot8 KEY_FUNCTION+2 bind F3+Dot7 KEY_FUNCTION+3 bind F2+Dot7 KEY_FUNCTION+4 bind F4+Dot7 KEY_FUNCTION+5 @@ -94,7 +94,7 @@ bind F4+Dot8 KEY_FUNCTION+7 bind Dot3+Dot4+Dot5+Dot6+Dot7 KEY_FUNCTION+8 bind Space+Dot1+Dot3+Dot5 KEY_FUNCTION+9 bind Dot1+Dot4+Dot5+Dot6+Dot7 KEY_FUNCTION+10 -bind Dot1+Dot2+Dot4+Dot5+Dot8 KEY_FUNCTION+11 +bind F4+Dot1+Dot2+Dot4+Dot5+Dot8 KEY_FUNCTION+11 bind F1+Dot7 KEY_FUNCTION+5+shift bind F1+Space KEY_FUNCTION+6+shift @@ -152,8 +152,3 @@ include letters.kti endVariables hide off -# F2 conflicts with Shift-Tab: Space+Dot1+Dot2 -# F3 conflicts with Control-f: Dot1+Dot2+Dot4+Dot8 -# F12 conflicts with Control-g: Dot1+Dot2+Dot4+Dot5+Dot8 -# Function-F4 conflicts with Function-z: F2+Space+Dot1+Dot3+Dot5+Dot6 -# new: Control-Tab: Space+Dot1+Dot2+Dot8 diff --git a/Tables/Input/hm/right.kti b/Tables/Input/hm/right.kti index fa5114609519d0ffa6a815b7ee74835e12db9393..9436f83673bac1edece55142b4af720a34a842e2 100644 --- a/Tables/Input/hm/right.kti +++ b/Tables/Input/hm/right.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/scroll.ktb b/Tables/Input/hm/scroll.ktb index d27e641eebb51caf91e7a59a24d06e8490292982..d2bd9dcf286fd8bf4d42391e8a28ba772aad302b 100644 --- a/Tables/Input/hm/scroll.ktb +++ b/Tables/Input/hm/scroll.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/scroll.kti b/Tables/Input/hm/scroll.kti index ff393345d44483231ceddc66ba5edc0d442da546..856e906ee0065c0d381360dc7549d7a8342ae362 100644 --- a/Tables/Input/hm/scroll.kti +++ b/Tables/Input/hm/scroll.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/sync.ktb b/Tables/Input/hm/sync.ktb index 7f174939c4e39592640755df006ba76c1170a656..a121061ff8435d21f6103541d433c5a30256696b 100644 --- a/Tables/Input/hm/sync.ktb +++ b/Tables/Input/hm/sync.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/ab40.ktb b/Tables/Input/ht/ab40.ktb index 5a13977372e4e52a2d7e2af6856b8c1adf1eb3bc..0f5865a7ab06978e4e597e315df3d977a3262691 100644 --- a/Tables/Input/ht/ab40.ktb +++ b/Tables/Input/ht/ab40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/as40.ktb b/Tables/Input/ht/as40.ktb index 20548e704a2a219ab8b9c07148c5b998c38737cb..c2eccf04187c7d946fb70bde79c9e57ff5dedcaf 100644 --- a/Tables/Input/ht/as40.ktb +++ b/Tables/Input/ht/as40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/bb.ktb b/Tables/Input/ht/bb.ktb index 7473a3505bfd740e0f5962f0fb469a3536c34998..acd7a6d6258f2ea04cf7bf4f8e359b22c73f7c7d 100644 --- a/Tables/Input/ht/bb.ktb +++ b/Tables/Input/ht/bb.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/bkwm.ktb b/Tables/Input/ht/bkwm.ktb index 1744f09d9e9965a5e84f9a8d6e33ae57e4d455bf..e98921c7f60154a54af1e6d9d1cd20f8f0969ea2 100644 --- a/Tables/Input/ht/bkwm.ktb +++ b/Tables/Input/ht/bkwm.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/brln.ktb b/Tables/Input/ht/brln.ktb index 80d154f619d5d0038afc5a428c65ac075c80f67e..dea70ebd2f839ce9d344fa0bc5ff90faa71c0c1e 100644 --- a/Tables/Input/ht/brln.ktb +++ b/Tables/Input/ht/brln.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/bs.kti b/Tables/Input/ht/bs.kti index 56d0555c5253319b92271dbf2ca4cd1cfe356da3..6659853a0795827ec377e4077f30ff90cf236201 100644 --- a/Tables/Input/ht/bs.kti +++ b/Tables/Input/ht/bs.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/bs40.ktb b/Tables/Input/ht/bs40.ktb index 89c4e71c53f57c4e449e7affe83e640a131e028b..98dc8e21a00790120aa5211061b262f85a55e37d 100644 --- a/Tables/Input/ht/bs40.ktb +++ b/Tables/Input/ht/bs40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/bs80.ktb b/Tables/Input/ht/bs80.ktb index c7ac602aab99c72102a0a03b0d4ddcd2c23a9a5f..bec23bdf106cd9ab9eafcda6fc3baa5efd0351da 100644 --- a/Tables/Input/ht/bs80.ktb +++ b/Tables/Input/ht/bs80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/cb40.ktb b/Tables/Input/ht/cb40.ktb index 09ec1cd39183357e293960002f4f0a2f3880cdf4..422031abf878e4b2f88cb2e935e5b82956d0f329 100644 --- a/Tables/Input/ht/cb40.ktb +++ b/Tables/Input/ht/cb40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/dots.kti b/Tables/Input/ht/dots.kti index 74580f7bce5405152585a50cb6de4482a4da0288..cb10391bdc27adb4bb731213c0820f87d9f13d1b 100644 --- a/Tables/Input/ht/dots.kti +++ b/Tables/Input/ht/dots.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/easy.ktb b/Tables/Input/ht/easy.ktb index 20c88a42b94cc9af8166fb26f6500795b006711a..b0c696334a833479bee372c9187e586ab4faa9fb 100644 --- a/Tables/Input/ht/easy.ktb +++ b/Tables/Input/ht/easy.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/input.kti b/Tables/Input/ht/input.kti index 50419007cfc0d9241b2cb26f40bcd82487a365f6..4cb1ef493928effda12a82c010e8f705f24df6bc 100644 --- a/Tables/Input/ht/input.kti +++ b/Tables/Input/ht/input.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/keypad.kti b/Tables/Input/ht/keypad.kti index 06df3ea66ad83bba8a36d2e4d4b4f0240bb7c3a1..4b197fe572730b432d62d03e4490dd55c9fa918f 100644 --- a/Tables/Input/ht/keypad.kti +++ b/Tables/Input/ht/keypad.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/mc88.ktb b/Tables/Input/ht/mc88.ktb index 248dbcc8c87f137cc6ba4ee26834a42fba55a9ca..f4ef1e3db198f1b146ded8dc94dcadc23ea0303d 100644 --- a/Tables/Input/ht/mc88.ktb +++ b/Tables/Input/ht/mc88.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/mdlr.ktb b/Tables/Input/ht/mdlr.ktb index 4dbf61e36830829905e0bac52385dba571602140..200169bc9a47cd453814a0d0815b95493bb6b94e 100644 --- a/Tables/Input/ht/mdlr.ktb +++ b/Tables/Input/ht/mdlr.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/me.kti b/Tables/Input/ht/me.kti index 4bc9f4e0ad120562cf785ae1c4b850ab85bbdfee..a8cd9c765466fcc0f7d8b204371dd9f98586c64c 100644 --- a/Tables/Input/ht/me.kti +++ b/Tables/Input/ht/me.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/me64.ktb b/Tables/Input/ht/me64.ktb index fc023371e0b1a97f5e5c4f5bcb5c10f64eafc9a6..170cef4c60a8775a6ccc94b3b4d8ab0335926109 100644 --- a/Tables/Input/ht/me64.ktb +++ b/Tables/Input/ht/me64.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/me88.ktb b/Tables/Input/ht/me88.ktb index 4b19c2dbfdd61093a790a0e7576c75c5712b1c22..23a7f1e9cc86bed33e827540737fa43676886275 100644 --- a/Tables/Input/ht/me88.ktb +++ b/Tables/Input/ht/me88.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/rockers.kti b/Tables/Input/ht/rockers.kti index 82a1f8c10e062a4c9b73d182654d99becdc0b088..b98a174d112b67dbedf72c3377da8340bf06c75a 100644 --- a/Tables/Input/ht/rockers.kti +++ b/Tables/Input/ht/rockers.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/wave.ktb b/Tables/Input/ht/wave.ktb index 9f3f5bb9fca347d7672363f0afe1ccdaeae15b4a..d481a9e1a6505b2b94738785247c59e4c16d79df 100644 --- a/Tables/Input/ht/wave.ktb +++ b/Tables/Input/ht/wave.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hw/kbd.kti b/Tables/Input/hw/kbd.kti new file mode 100644 index 0000000000000000000000000000000000000000..e69b2d05a53e253727ba24448d3b3de55ed87c8e --- /dev/null +++ b/Tables/Input/hw/kbd.kti @@ -0,0 +1,38 @@ +############################################################################### +# BRLTTY - A background process providing access to 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 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 . +############################################################################### + +assign chord Space+ +include ../chords.kti + +map Dot1 DOT1 +map Dot2 DOT2 +map Dot3 DOT3 +map Dot4 DOT4 +map Dot5 DOT5 +map Dot6 DOT6 +map Dot7 DOT7 +map Dot8 DOT8 +map Space SPACE +map Thumb2 META +map Thumb3 CONTROL + +bind Space+RoutingKey KEY_FUNCTION +bind Thumb2+Space+RoutingKey KEY_FUNCTION+meta +bind Thumb3+Space+RoutingKey KEY_FUNCTION+control +bind Thumb2+Thumb3+Space+RoutingKey KEY_FUNCTION+meta+control + diff --git a/Tables/Input/hw/mb1.ktb b/Tables/Input/hw/mb1.ktb new file mode 100644 index 0000000000000000000000000000000000000000..c12449de7db279bd3493f2be47d11f68e9ae8a44 --- /dev/null +++ b/Tables/Input/hw/mb1.ktb @@ -0,0 +1,21 @@ +############################################################################### +# BRLTTY - A background process providing access to 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 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 HumanWare Brailliant B (has no keyboard) + +include nav.kti diff --git a/Tables/Input/hw/mb2.ktb b/Tables/Input/hw/mb2.ktb new file mode 100644 index 0000000000000000000000000000000000000000..0fb0dbcfcfd8040e2af92bf1c7176ef783d32fcc --- /dev/null +++ b/Tables/Input/hw/mb2.ktb @@ -0,0 +1,22 @@ +############################################################################### +# BRLTTY - A background process providing access to 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 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 HumanWare Brailliant BI (has braille keyboard) + +include nav.kti +include kbd.kti diff --git a/Tables/Input/hw/all.ktb b/Tables/Input/hw/nav.kti similarity index 77% rename from Tables/Input/hw/all.ktb rename to Tables/Input/hw/nav.kti index 04432c4c03e88ee13c88d826c764add313a8aaf0..e0c60f72f24379a7a0d3ad4816a5db88d717fa46 100644 --- a/Tables/Input/hw/all.ktb +++ b/Tables/Input/hw/nav.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,9 +16,6 @@ # This software is maintained by Dave Mielke . ############################################################################### -title HumanWare - - #################### # Default Bindings # #################### @@ -40,26 +37,6 @@ bind Thumb3+RoutingKey COPY_RECT bind Thumb4+RoutingKey COPY_LINE bind Thumb1+Thumb4 PASTE -assign chord Space+ -include ../chords.kti - -map Dot1 DOT1 -map Dot2 DOT2 -map Dot3 DOT3 -map Dot4 DOT4 -map Dot5 DOT5 -map Dot6 DOT6 -map Dot7 DOT7 -map Dot8 DOT8 -map Space SPACE -map Thumb2 META -map Thumb3 CONTROL - -bind Space+RoutingKey KEY_FUNCTION -bind Thumb2+Space+RoutingKey KEY_FUNCTION+meta -bind Thumb3+Space+RoutingKey KEY_FUNCTION+control -bind Thumb2+Thumb3+Space+RoutingKey KEY_FUNCTION+meta+control - include ../bm/display6.kti include ../bm/routing6.kti diff --git a/Tables/Input/ir/all.kti b/Tables/Input/ir/all.kti index 173615c8baa757756ec8d53f30ac522a44587ebf..a2f87e4089a8db0c084917154bbf7c197efab700 100644 --- a/Tables/Input/ir/all.kti +++ b/Tables/Input/ir/all.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ir/brl.ktb b/Tables/Input/ir/brl.ktb index ce101c9c0b8a7fbac7336f43e4ae2ac40f0c0098..bf45a715aae5b7e027e85b51eb4794cea79d649b 100644 --- a/Tables/Input/ir/brl.ktb +++ b/Tables/Input/ir/brl.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ir/pc.ktb b/Tables/Input/ir/pc.ktb index 5660482c1365e3759fdbcc39a15e1c79d9e4be3a..c3d510dd0bcfc0418edac67a16fb8eebd4d82978 100644 --- a/Tables/Input/ir/pc.ktb +++ b/Tables/Input/ir/pc.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/common.kti b/Tables/Input/md/common.kti index a87603ccc55c7da826afba7c5e169984edd2de2b..356ce48f837df39bcc84d040e6c2967a5194d671 100644 --- a/Tables/Input/md/common.kti +++ b/Tables/Input/md/common.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/default.ktb b/Tables/Input/md/default.ktb index 2928ba588b0545b7214e53596c71f37b467cf2fd..8b4b0f759cb6a7e7507bf23f3fa9306dfe5eb3b5 100644 --- a/Tables/Input/md/default.ktb +++ b/Tables/Input/md/default.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/fk.ktb b/Tables/Input/md/fk.ktb index 80a2b3d7286de361a121e46048e8b12c46f49f38..6061eec44892ca3f916238b8eafd6ec37dff53d3 100644 --- a/Tables/Input/md/fk.ktb +++ b/Tables/Input/md/fk.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/fk_s.ktb b/Tables/Input/md/fk_s.ktb index 183b575718fe45d4391efebdb122548414419f18..3e24f5f09f9676325a30d4c087336507fd01441c 100644 --- a/Tables/Input/md/fk_s.ktb +++ b/Tables/Input/md/fk_s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/fkeys.kti b/Tables/Input/md/fkeys.kti index 43fa796ea29da3aae789cdf81c1c9eae7f1da378..3393a0a029cb270b37d3c42d62157887cad0cd92 100644 --- a/Tables/Input/md/fkeys.kti +++ b/Tables/Input/md/fkeys.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/kbd.ktb b/Tables/Input/md/kbd.ktb index 654db5da65b0474428c78fb04145cf9d5a999dae..0380885593e2567930a23d532740eee608688b82 100644 --- a/Tables/Input/md/kbd.ktb +++ b/Tables/Input/md/kbd.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/keyboard.kti b/Tables/Input/md/keyboard.kti index a4703afeb839c86c2c63d1b140c04b3340e2e5b4..112f523b5a0500215a7bb4afaecfd0cbc96a0b39 100644 --- a/Tables/Input/md/keyboard.kti +++ b/Tables/Input/md/keyboard.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/status.kti b/Tables/Input/md/status.kti index 6b356f92991ec6791e7e1399466451bec131ab6b..91c875699742938eff2ad1c33c4168328b16bf8a 100644 --- a/Tables/Input/md/status.kti +++ b/Tables/Input/md/status.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/menu.kti b/Tables/Input/menu.kti index c6d3972e1c8301d773ea1e3aecc2e50e04de4903..3d47b3df0390ee92c16e9219549abb413d0e3d24 100644 --- a/Tables/Input/menu.kti +++ b/Tables/Input/menu.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mm/common.kti b/Tables/Input/mm/common.kti index 4c0532865703546be87518a66964ece0c4aaba50..34947ca9f676c75b9b369bb84356f1f7b2e400e9 100644 --- a/Tables/Input/mm/common.kti +++ b/Tables/Input/mm/common.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mm/pocket.ktb b/Tables/Input/mm/pocket.ktb index c3d1b4c4bcaf48ff84b4949ff3f8380771169832..ef60c6072626d0768f9a14cf77a99c115e5aabe6 100644 --- a/Tables/Input/mm/pocket.ktb +++ b/Tables/Input/mm/pocket.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mm/smart.ktb b/Tables/Input/mm/smart.ktb index c9acedc2682f9c8c8c5bf50f3e22fb7756bf9ac0..8fb4fd6fff9cf70f64111510955994be65bae331 100644 --- a/Tables/Input/mm/smart.ktb +++ b/Tables/Input/mm/smart.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd1_3.ktb b/Tables/Input/mt/bd1_3.ktb index 1f0664d25e0f590b839bfad49cf5234ee9c13669..77b2f07e696496b70e415604aeda54f564a7f5b6 100644 --- a/Tables/Input/mt/bd1_3.ktb +++ b/Tables/Input/mt/bd1_3.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd1_3.kti b/Tables/Input/mt/bd1_3.kti index df756a154f1f9f6b0cf57e00dc859460aea105c3..644a37b650e053ff9aa1a329df99f3269370b71c 100644 --- a/Tables/Input/mt/bd1_3.kti +++ b/Tables/Input/mt/bd1_3.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd1_3s.ktb b/Tables/Input/mt/bd1_3s.ktb index ce47dfbb6bf752eb12ab734cf22708d09f32d563..8132c6b5c3c7444a2a162534e26c4235d1a665f4 100644 --- a/Tables/Input/mt/bd1_3s.ktb +++ b/Tables/Input/mt/bd1_3s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd1_6.ktb b/Tables/Input/mt/bd1_6.ktb index cf1189ae95e50d414054816a1e3d1e1223dc62d3..b168605521a4f640aa8d89949697d20a5de92f2a 100644 --- a/Tables/Input/mt/bd1_6.ktb +++ b/Tables/Input/mt/bd1_6.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd1_6.kti b/Tables/Input/mt/bd1_6.kti index 3bcfaf4e570405875500cf2a485512d2d412c036..cd43e60eacb5280641b0b6566b33a667a2320a63 100644 --- a/Tables/Input/mt/bd1_6.kti +++ b/Tables/Input/mt/bd1_6.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd1_6s.ktb b/Tables/Input/mt/bd1_6s.ktb index 96d27a2cf687867f9d2e0c9c6b22176e995f67e4..faa9206159da134ff017e59c99cd018116887989 100644 --- a/Tables/Input/mt/bd1_6s.ktb +++ b/Tables/Input/mt/bd1_6s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/bd2.ktb b/Tables/Input/mt/bd2.ktb index 0c695fcbabe9fbf6762a178324626aface8f8eb1..a1dbf3270f2ce33f736de34b647fa2fcab417cf7 100644 --- a/Tables/Input/mt/bd2.ktb +++ b/Tables/Input/mt/bd2.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/mt/status.kti b/Tables/Input/mt/status.kti index d64dda1eb67992c1d2108a09c1dae3f6a8e60d78..23f4182e3f54d9cbb170c63f927d663544ff7a16 100644 --- a/Tables/Input/mt/status.kti +++ b/Tables/Input/mt/status.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/np/all.ktb b/Tables/Input/np/all.ktb index 37badb809c658f000f2f5808e611d3beca351195..54ffa372dd9d94775fc34e4b0704755cd5ff469c 100644 --- a/Tables/Input/np/all.ktb +++ b/Tables/Input/np/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pg/all.ktb b/Tables/Input/pg/all.ktb index d835de9a6ad56e0d46ab0b1d0006185b4dc819bd..80c9adc7c9caaef68b5832bc92c914ae5a89f650 100644 --- a/Tables/Input/pg/all.ktb +++ b/Tables/Input/pg/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/2d_l.ktb b/Tables/Input/pm/2d_l.ktb index 99d42965c9f2350fab955d1a1fd71d25dba91160..948dabd05bfb1ca27c4ce228d3f66cb7bdee6349 100644 --- a/Tables/Input/pm/2d_l.ktb +++ b/Tables/Input/pm/2d_l.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/2d_s.ktb b/Tables/Input/pm/2d_s.ktb index 520178bf25942045dbe7d840023eb75d0b8cb598..cabb7cd49d06becc1adafa04a5f7f92636530097 100644 --- a/Tables/Input/pm/2d_s.ktb +++ b/Tables/Input/pm/2d_s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/bar.kti b/Tables/Input/pm/bar.kti index 10abe81b64953a1f6515fb71680030c9307dcc3d..7af0ab515c4b6830a310dc04abb33711399ac4a2 100644 --- a/Tables/Input/pm/bar.kti +++ b/Tables/Input/pm/bar.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,12 +18,23 @@ # This key subtable is for Papenmeier displays which have an Easy Access Bar. +note The long key on the front is the Easy Access Bar. + +ifVar hasSingleStepBar + note * It can only be moved one step in each direction (left, right, up, down). + note * To emulate the second step, also press any of the lower routing keys + note * (those in the row just behind the text cells). +else + note * It can be moved two steps in each direction (left, right, up, down). +endIf + bind BarUp1 LNUP bind BarDown1 LNDN -bind BarUp2 TOP -bind BarDown2 BOT bind BarLeft1 FWINLT bind BarRight1 FWINRT + +bind BarUp2 TOP +bind BarDown2 BOT bind BarLeft2 LNBEG bind BarRight2 LNEND @@ -35,26 +46,53 @@ bind BarRight1+BarRight2 LNEND hide off include routing.kti -bind BarUp1+!RoutingKey1 PRINDENT -bind BarDown1+!RoutingKey1 NXINDENT -bind BarUp2+!RoutingKey1 SETLEFT -bind BarDown2+!RoutingKey1 DESCCHAR -bind BarLeft1+!RoutingKey1 CLIP_ADD -bind BarRight1+!RoutingKey1 COPY_LINE -bind BarLeft2+!RoutingKey1 CLIP_NEW -bind BarRight2+!RoutingKey1 COPY_RECT -hide on -bind BarUp1+BarUp2+!RoutingKey1 SETLEFT -bind BarDown1+BarDown2+!RoutingKey1 DESCCHAR -bind BarLeft1+BarLeft2+!RoutingKey1 CLIP_NEW -bind BarRight1+BarRight2+!RoutingKey1 COPY_RECT -hide off +ifNotVar hasSingleStepBar + bind BarUp1+RoutingKey1 PRINDENT + bind BarDown1+RoutingKey1 NXINDENT + bind BarLeft1+RoutingKey1 CLIP_ADD + bind BarRight1+RoutingKey1 COPY_LINE + + bind BarUp2+RoutingKey1 SETLEFT + bind BarDown2+RoutingKey1 DESCCHAR + bind BarLeft2+RoutingKey1 CLIP_NEW + bind BarRight2+RoutingKey1 COPY_RECT + + hide on + bind BarUp1+BarUp2+RoutingKey1 SETLEFT + bind BarDown1+BarDown2+RoutingKey1 DESCCHAR + bind BarLeft1+BarLeft2+RoutingKey1 CLIP_NEW + bind BarRight1+BarRight2+RoutingKey1 COPY_RECT + hide off +endIf assign toggleOff BarLeft1 assign toggleOn BarRight1 include status\{statusKeys}.kti include keys.kti -ifKey RoutingKey2 bind !RoutingKey2 DESCCHAR + +ifKey RoutingKey2 +endIf + ifKey StatusKey2 bind !StatusKey2 GOTOLINE + + +context menu +bind BarUp1 MENU_PREV_ITEM +bind BarDown1 MENU_NEXT_ITEM +bind BarUp2 MENU_FIRST_ITEM +bind BarDown2 MENU_LAST_ITEM +bind BarLeft1 MENU_PREV_SETTING +bind BarRight1 MENU_NEXT_SETTING +bind BarLeft2 PREFLOAD +bind BarRight2 PREFSAVE + +hide on +bind BarUp1+BarUp2 MENU_FIRST_ITEM +bind BarDown1+BarDown2 MENU_LAST_ITEM +bind BarLeft1+BarLeft2 PREFLOAD +bind BarRight1+BarRight2 PREFSAVE +hide off + + diff --git a/Tables/Input/pm/c.ktb b/Tables/Input/pm/c.ktb index f567c90a6bc2d8437645471e59aabd5e29bcc94c..a2edf52a63ad50c8931bfce69e70d7a96839970e 100644 --- a/Tables/Input/pm/c.ktb +++ b/Tables/Input/pm/c.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/c_486.ktb b/Tables/Input/pm/c_486.ktb index 613740e5a3c80a3ed7856357a075056bfb0a3fce..1aaa19fc72433d04dd607e32ae196a2ca51bbd07 100644 --- a/Tables/Input/pm/c_486.ktb +++ b/Tables/Input/pm/c_486.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el2d_80s.ktb b/Tables/Input/pm/el2d_80s.ktb index c0885d511db773e5ddcdaa649e1b1124ff9f1346..e1f60272d421611149ff4a449e080eb7a809a4b7 100644 --- a/Tables/Input/pm/el2d_80s.ktb +++ b/Tables/Input/pm/el2d_80s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el40c.ktb b/Tables/Input/pm/el40c.ktb index e26a238b1c59c8c1d01fd88afe2df7a8d466e3fe..ee126266763e8c6987c010bfca90badae705d316 100644 --- a/Tables/Input/pm/el40c.ktb +++ b/Tables/Input/pm/el40c.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,5 +18,6 @@ title Papenmeier BrailleX EL40c +assign hasSingleStepBar assign statusKeys 0 include bar.kti diff --git a/Tables/Input/pm/el40s.ktb b/Tables/Input/pm/el40s.ktb index c52e942e2286dd8ced5e603d6bcf81c1f4b774cd..f519c6ad6ff91ccd230e670897c950b818c98787 100644 --- a/Tables/Input/pm/el40s.ktb +++ b/Tables/Input/pm/el40s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el60c.ktb b/Tables/Input/pm/el60c.ktb index 046f05b26a70a21824ce03731fc2e6576e91d60e..2c9cd388d67d47dc774c0003bba3ef132c3bab0f 100644 --- a/Tables/Input/pm/el60c.ktb +++ b/Tables/Input/pm/el60c.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,5 +18,6 @@ title Papenmeier BrailleX EL60c +assign hasSingleStepBar assign statusKeys 0 include bar.kti diff --git a/Tables/Input/pm/el66s.ktb b/Tables/Input/pm/el66s.ktb index a6ed7cb4c4db5720f3f9abe399e8d2e02a2a1576..95d55c4bbe8cdd291496ea6c2831bb01481dc21a 100644 --- a/Tables/Input/pm/el66s.ktb +++ b/Tables/Input/pm/el66s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el70s.ktb b/Tables/Input/pm/el70s.ktb index b4ae4853765cabafe03388ac3794ea5eac67e166..bf65c59c665eb5c8235cfad2ba554d0305a5c4b9 100644 --- a/Tables/Input/pm/el70s.ktb +++ b/Tables/Input/pm/el70s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el80_ii.ktb b/Tables/Input/pm/el80_ii.ktb index 8a84b1deebfa8cafe1bdd2c63fa6dea6363b5df1..5ff780f02505c113a2e00d31948de7390a51599d 100644 --- a/Tables/Input/pm/el80_ii.ktb +++ b/Tables/Input/pm/el80_ii.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el80c.ktb b/Tables/Input/pm/el80c.ktb index 5d6c9f9d0eeb72a57be9c6e98be488b512b1f64b..a0e7a724869bdcba98d7d9320dc9a218f6c8ac46 100644 --- a/Tables/Input/pm/el80c.ktb +++ b/Tables/Input/pm/el80c.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,5 +18,6 @@ title Papenmeier BrailleX EL80c +assign hasSingleStepBar assign statusKeys 0 include bar.kti diff --git a/Tables/Input/pm/el80s.ktb b/Tables/Input/pm/el80s.ktb index ce86c027a384fba565f2ba104348aab852e66c56..c3d144b1ab4cc88366f6e4b46bca1f2e5ccb7e90 100644 --- a/Tables/Input/pm/el80s.ktb +++ b/Tables/Input/pm/el80s.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el_2d_40.ktb b/Tables/Input/pm/el_2d_40.ktb index 54a35c3b7d8d7c6054774bdcab1ecc64a57d6e92..8b16efb9cf6060fa5699bf62261def0024495817 100644 --- a/Tables/Input/pm/el_2d_40.ktb +++ b/Tables/Input/pm/el_2d_40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el_2d_66.ktb b/Tables/Input/pm/el_2d_66.ktb index abd6972b074a5779ed6bebc1422b10de06a17d14..052be67c576e380113fb6c696f940877a5e47f74 100644 --- a/Tables/Input/pm/el_2d_66.ktb +++ b/Tables/Input/pm/el_2d_66.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el_2d_80.ktb b/Tables/Input/pm/el_2d_80.ktb index 9d2f83dff6c02b4db9fb2414b5c30da1183dcd74..2df1077b018c534fea66b562b999a7ce595c2934 100644 --- a/Tables/Input/pm/el_2d_80.ktb +++ b/Tables/Input/pm/el_2d_80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/el_40_p.ktb b/Tables/Input/pm/el_40_p.ktb index 72a4690d641289ec451eb5f541f39ffefaca6085..41158239231f2fdc7f5e31a32777ec3b2f3f8505 100644 --- a/Tables/Input/pm/el_40_p.ktb +++ b/Tables/Input/pm/el_40_p.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,6 +18,7 @@ title Papenmeier BrailleX EL 40 P +assign noRightKey assign statusKeys 0 include bar.kti include switches.kti diff --git a/Tables/Input/pm/el_80.ktb b/Tables/Input/pm/el_80.ktb index ec9d00da09d203ee5df42032faeac65750c174fd..282e157ea97b3025c257749df561078898961878 100644 --- a/Tables/Input/pm/el_80.ktb +++ b/Tables/Input/pm/el_80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/elb_tr_20.ktb b/Tables/Input/pm/elb_tr_20.ktb index e14814160eae4d1ca2cab776e9ea7f618780e723..11e107b4aa41cb3ee73655cc1fc9bea0366a0800 100644 --- a/Tables/Input/pm/elb_tr_20.ktb +++ b/Tables/Input/pm/elb_tr_20.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/elb_tr_32.ktb b/Tables/Input/pm/elb_tr_32.ktb index 28a6816bbf93e6e25924c1b0a829eef2d097964f..796c0618e58fb26104f883600e4a0947fd0bc1b5 100644 --- a/Tables/Input/pm/elb_tr_32.ktb +++ b/Tables/Input/pm/elb_tr_32.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/elba_20.ktb b/Tables/Input/pm/elba_20.ktb index dae6674a7decb99b9c63963fad74cf04afbdadb3..619e113b5e377e08ff50e2e3c0a1d0c396ad6b27 100644 --- a/Tables/Input/pm/elba_20.ktb +++ b/Tables/Input/pm/elba_20.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,6 +18,7 @@ title Papenmeier BrailleX Elba 20 +assign keyEmulation assign statusKeys 0 include bar.kti include switches.kti diff --git a/Tables/Input/pm/elba_32.ktb b/Tables/Input/pm/elba_32.ktb index 76b2fc53489530219cea7b6bcd732449beb60190..b3cd26ecd1d7f0c7e6b2190e565a73ff41a5ffcd 100644 --- a/Tables/Input/pm/elba_32.ktb +++ b/Tables/Input/pm/elba_32.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,6 +18,7 @@ title Papenmeier BrailleX Elba 32 +assign keyEmulation assign statusKeys 0 include bar.kti include switches.kti diff --git a/Tables/Input/pm/front13.kti b/Tables/Input/pm/front13.kti index 4a86f43186b66778eaa3c08aa992011ed4eb51f1..bf19a559c4ea7964d277a284a103b2fe9e1bc7e2 100644 --- a/Tables/Input/pm/front13.kti +++ b/Tables/Input/pm/front13.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/front9.kti b/Tables/Input/pm/front9.kti index 522a2c87f1339eb375cdd602002dc994b50b4edb..31edb931057a88a60901ada3fc226a9a5619104d 100644 --- a/Tables/Input/pm/front9.kti +++ b/Tables/Input/pm/front9.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/ib_80.ktb b/Tables/Input/pm/ib_80.ktb index e711db8eef0fc29f8e76969751e692fb63ee04cc..d679ff8501add9233c90483a32dc88f99f50452e 100644 --- a/Tables/Input/pm/ib_80.ktb +++ b/Tables/Input/pm/ib_80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/keyboard.kti b/Tables/Input/pm/keyboard.kti index 367b0d5d90a81574a504233c2d32b6d9d441507a..eb3e8730305c880f6af62bda61017799adf50f1c 100644 --- a/Tables/Input/pm/keyboard.kti +++ b/Tables/Input/pm/keyboard.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/keys.kti b/Tables/Input/pm/keys.kti index cd678010ac6ba954563bd1432a78d8e0b789e320..ecf9ad4217920efb0570cd7512d5830a35db0f40 100644 --- a/Tables/Input/pm/keys.kti +++ b/Tables/Input/pm/keys.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,68 +18,97 @@ # This key subtable is for Papenmeier displays which have keys. +ifVar keyEmulation + note The left and right keys are emulated. Enter key emulation mode by + note * pressing Thumb1 + Thumb2 (Left Windows + Right Windows). Then press: + note + Left Key Rear: Left Thumb (Left Windows) + note + Left Key Front: Space + Left Thumb (Context + Left Windows) + note + Right Key Rear: Right Thumb (Right Windows) + note + Right Key Front: Space + Right Thumb (Context + Right Windows) +else + ifVar noRightKey + note The rocker at the left side of the top that doesn't stay when pressed + note * is named the Left Key. + else + note The rockers at each side of the top that don't stay when pressed + note * are named the Left and Right Key. + endIf +endIf + bind LeftKeyRear BACK bind LeftKeyFront HOME -bind RightKeyRear HELP -bind RightKeyFront LEARN -bind LeftKeyRear+BarUp1 SIXDOTS -bind LeftKeyRear+BarDown1 PASTE -bind LeftKeyRear+BarUp2 CAPBLINK -bind LeftKeyRear+BarDown2 CSRJMP_VERT bind LeftKeyRear+BarLeft1 DISPMD bind LeftKeyRear+BarRight1 CSRTRK +bind LeftKeyRear+BarUp1 SIXDOTS +bind LeftKeyRear+BarDown1 PASTE + bind LeftKeyRear+BarLeft2 ATTRVIS bind LeftKeyRear+BarRight2 CSRVIS +bind LeftKeyRear+BarUp2 CAPBLINK +bind LeftKeyRear+BarDown2 CSRJMP_VERT hide on -bind LeftKeyRear+BarUp1+BarUp2 CAPBLINK -bind LeftKeyRear+BarDown1+BarDown2 CSRJMP_VERT bind LeftKeyRear+BarLeft1+BarLeft2 ATTRVIS bind LeftKeyRear+BarRight1+BarRight2 CSRVIS +bind LeftKeyRear+BarUp1+BarUp2 CAPBLINK +bind LeftKeyRear+BarDown1+BarDown2 CSRJMP_VERT hide off -bind LeftKeyFront+BarUp1 AUTOSPEAK -bind LeftKeyFront+BarDown1 AUTOREPEAT -bind LeftKeyFront+BarUp2 RESTARTBRL -bind LeftKeyFront+BarDown2 FREEZE bind LeftKeyFront+BarLeft1 INFO bind LeftKeyFront+BarRight1 PREFMENU +bind LeftKeyFront+BarUp1 AUTOSPEAK +bind LeftKeyFront+BarDown1 AUTOREPEAT + bind LeftKeyFront+BarLeft2 PREFLOAD bind LeftKeyFront+BarRight2 PREFSAVE +bind LeftKeyFront+BarUp2 RESTARTBRL +bind LeftKeyFront+BarDown2 FREEZE hide on -bind LeftKeyFront+BarUp1+BarUp2 RESTARTBRL -bind LeftKeyFront+BarDown1+BarDown2 FREEZE bind LeftKeyFront+BarLeft1+BarLeft2 PREFLOAD bind LeftKeyFront+BarRight1+BarRight2 PREFSAVE +bind LeftKeyFront+BarUp1+BarUp2 RESTARTBRL +bind LeftKeyFront+BarDown1+BarDown2 FREEZE hide off -bind RightKeyRear+BarUp1 SAY_ABOVE -bind RightKeyRear+BarDown1 SAY_BELOW -bind RightKeyRear+BarUp2 SAY_LOUDER -bind RightKeyRear+BarDown2 SAY_SOFTER -bind RightKeyRear+BarLeft1 MUTE -bind RightKeyRear+BarRight1 SAY_LINE -bind RightKeyRear+BarLeft2 SAY_SLOWER -bind RightKeyRear+BarRight2 SAY_FASTER +ifNotVar noRightKey + bind RightKeyRear HELP + bind RightKeyFront LEARN -hide on -bind RightKeyRear+BarUp1+BarUp2 SAY_LOUDER -bind RightKeyRear+BarDown1+BarDown2 SAY_SOFTER -bind RightKeyRear+BarLeft1+BarLeft2 SAY_SLOWER -bind RightKeyRear+BarRight1+BarRight2 SAY_FASTER -hide off + bind RightKeyRear+BarLeft1 MUTE + bind RightKeyRear+BarRight1 SAY_LINE + bind RightKeyRear+BarUp1 SAY_ABOVE + bind RightKeyRear+BarDown1 SAY_BELOW -bind RightKeyFront+BarUp1 SPKHOME -bind RightKeyFront+BarDown1 TUNES -bind RightKeyFront+BarUp2 RESTARTSPEECH -bind RightKeyFront+BarLeft1 SKPIDLNS -bind RightKeyFront+BarRight1 SKPBLNKWINS -bind RightKeyFront+BarRight2 SLIDEWIN + bind RightKeyRear+BarLeft2 SAY_SLOWER + bind RightKeyRear+BarRight2 SAY_FASTER + bind RightKeyRear+BarUp2 SAY_LOUDER + bind RightKeyRear+BarDown2 SAY_SOFTER -hide on -bind RightKeyFront+BarUp1+BarUp2 RESTARTSPEECH -bind RightKeyFront+BarRight1+BarRight2 SLIDEWIN -hide off + hide on + bind RightKeyRear+BarLeft1+BarLeft2 SAY_SLOWER + bind RightKeyRear+BarRight1+BarRight2 SAY_FASTER + bind RightKeyRear+BarUp1+BarUp2 SAY_LOUDER + bind RightKeyRear+BarDown1+BarDown2 SAY_SOFTER + hide off + + bind RightKeyFront+BarLeft1 SKPIDLNS + bind RightKeyFront+BarRight1 SKPBLNKWINS + bind RightKeyFront+BarUp1 SPKHOME + bind RightKeyFront+BarDown1 TUNES + + bind RightKeyFront+BarUp2 RESTARTSPEECH + bind RightKeyFront+BarRight2 SLIDEWIN + + hide on + bind RightKeyFront+BarUp1+BarUp2 RESTARTSPEECH + bind RightKeyFront+BarRight1+BarRight2 SLIDEWIN + hide off + + bind LeftKeyRear+RoutingKey1 CLIP_NEW + bind LeftKeyFront+RoutingKey1 CLIP_ADD + bind RightKeyRear+RoutingKey1 COPY_LINE + bind RightKeyFront+RoutingKey1 COPY_RECT +endIf diff --git a/Tables/Input/pm/live.ktb b/Tables/Input/pm/live.ktb new file mode 100644 index 0000000000000000000000000000000000000000..f4741fdde45ea611fe0729fb79aab0f3742148fd --- /dev/null +++ b/Tables/Input/pm/live.ktb @@ -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-2016 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 Papenmeier BrailleX Live + +assign hasSingleStepBar +assign statusKeys 0 +include bar.kti +include keyboard.kti diff --git a/Tables/Input/pm/routing.kti b/Tables/Input/pm/routing.kti index 8849ab0bb693bdaf66d6c2a49cc0058bf776ea66..673b99b2120614be63ebc873b99f69c21d76bb5b 100644 --- a/Tables/Input/pm/routing.kti +++ b/Tables/Input/pm/routing.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -17,6 +17,12 @@ ############################################################################### # This key subtable is for Papenmeier displays which have primary routing keys. -note RoutingKey1 refers to any of the keys behind the text cells. -bind !RoutingKey1 ROUTE +note RoutingKey1 refers to the row of keys just behind the text cells. +bind RoutingKey1 ROUTE + +ifKey RoutingKey2 + note RoutingKey2 refers to the row of keys behind the RoutingKey1 row. + bind RoutingKey2 DESCCHAR +endIf + diff --git a/Tables/Input/pm/status0.kti b/Tables/Input/pm/status0.kti index 1e59126a852f2a961f0b93ae070c1868e9dbc8cc..5b60ce360713140e2ebe1b3622f9eae1c77b2d55 100644 --- a/Tables/Input/pm/status0.kti +++ b/Tables/Input/pm/status0.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status13.kti b/Tables/Input/pm/status13.kti index bfd416c6a96c11d714fa4e9db78173583c4d8ccc..338520e3088b565cf0165e95afc827c14de2cf44 100644 --- a/Tables/Input/pm/status13.kti +++ b/Tables/Input/pm/status13.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status2.kti b/Tables/Input/pm/status2.kti index 291806675a9bbfc4db1eb46f9272ac77a1178e8b..8f168906275a97b9eea9c5e2e80677fa1da0a196 100644 --- a/Tables/Input/pm/status2.kti +++ b/Tables/Input/pm/status2.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status20.kti b/Tables/Input/pm/status20.kti index 5570a778fd7f00185491a2b5a51b147562c01751..ae546390440bf2f5badc5b73c8ef573a0ed33433 100644 --- a/Tables/Input/pm/status20.kti +++ b/Tables/Input/pm/status20.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status22.kti b/Tables/Input/pm/status22.kti index 2096e9e6f333de101fea4dffb6115d767e124b8c..761ecd088b5be0217b012bf6cf9ed07e8e2e3bd6 100644 --- a/Tables/Input/pm/status22.kti +++ b/Tables/Input/pm/status22.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status4.kti b/Tables/Input/pm/status4.kti index e16edb484e3a501b454eda411368b8c2beb3a707..b21691edb9efaab4758c045dd430532f68be0e0b 100644 --- a/Tables/Input/pm/status4.kti +++ b/Tables/Input/pm/status4.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/switches.kti b/Tables/Input/pm/switches.kti index a8803ef5616fb72380876ebfc2c9bdaddd4929d2..d8c6034b8bd2080365a7f8d5e5108c8f666aeea3 100644 --- a/Tables/Input/pm/switches.kti +++ b/Tables/Input/pm/switches.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,6 +18,21 @@ # This key subtable is for Papenmeier displays which have switches. +ifVar keyEmulation + note The left and right switches are emulated. Enter key emulation mode by + note * pressing Thumb1 + Thumb2 (Left Windows + Right Windows). Then press: + note + Left Switch Rear: Dot 1 (f) + note + Left Switch Center: Dot 2 (d) + note + Left Switch Front: Dot 3 (s) + note + Right Switch Rear: Dot 4 (j) + note + Right Switch Center: Dot 5 (k) + note + Right Switch Front: Dot 6 (l) + note + center both switches: Dot 7 (a) +else + note The rockers at each side of the top that stay when pressed + note * are named the Left and Right Switch. +endIf + context switchesRearCenter Advanced Vertical Navigation (left switch rear) bind BarUp1 PRDIFLN @@ -106,25 +121,6 @@ context switchesFrontRear Unused (left switch front, right switch rear) context switchesFrontFront Unused (left switch front, right switch front) -context menu - -bind BarUp1 MENU_PREV_ITEM -bind BarDown1 MENU_NEXT_ITEM -bind BarUp2 MENU_FIRST_ITEM -bind BarDown2 MENU_LAST_ITEM -bind BarLeft1 MENU_PREV_SETTING -bind BarRight1 MENU_NEXT_SETTING -bind BarLeft2 PREFLOAD -bind BarRight2 PREFSAVE - -hide on -bind BarUp1+BarUp2 MENU_FIRST_ITEM -bind BarDown1+BarDown2 MENU_LAST_ITEM -bind BarLeft1+BarLeft2 PREFLOAD -bind BarRight1+BarRight2 PREFSAVE -hide off - - context switchesRearCenter hotkey LeftSwitchRear NOOP CONTEXT+default hotkey RightSwitchRear CONTEXT+switchesRearRear NOOP diff --git a/Tables/Input/pm/trio.ktb b/Tables/Input/pm/trio.ktb index af5f2c33391a49f1789d3d027d4a4cee899b7af1..52dbe74d8443ba816abd3ca58d9744adba7ec1d4 100644 --- a/Tables/Input/pm/trio.ktb +++ b/Tables/Input/pm/trio.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/sk/bdp.ktb b/Tables/Input/sk/bdp.ktb index 2046822caaafb7442b927282d04df2ab28ab27e9..66d06e8be1e267ff693708d942c031758b56f7e8 100644 --- a/Tables/Input/sk/bdp.ktb +++ b/Tables/Input/sk/bdp.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/sk/ntk.ktb b/Tables/Input/sk/ntk.ktb index 36dc6a3847a9db1143bcab082e46d3d3c1a080f8..bb20ce5a8bae6efd3fb96883e3f5b65a49f87efc 100644 --- a/Tables/Input/sk/ntk.ktb +++ b/Tables/Input/sk/ntk.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/toggle.kti b/Tables/Input/toggle.kti index e42401435339d6c3121358adf2d8ecdd506bdbaa..744fb9052d6371752a0e82233163da7f53d35ddd 100644 --- a/Tables/Input/toggle.kti +++ b/Tables/Input/toggle.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/nav.kti b/Tables/Input/ts/nav.kti index d9eba4cbe01c08a5e135b98239fe6d9f1f0546f6..e55ccd5550780430ab79b3f0d5dde4b4843fb06d 100644 --- a/Tables/Input/ts/nav.kti +++ b/Tables/Input/ts/nav.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/nav20.ktb b/Tables/Input/ts/nav20.ktb index 5036421b47baed4397a019aefebb9ea2bac7144e..553b7d3a300133b21710190321e5afc6d5a2772b 100644 --- a/Tables/Input/ts/nav20.ktb +++ b/Tables/Input/ts/nav20.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/nav40.ktb b/Tables/Input/ts/nav40.ktb index 2825fed3984aed57f03dd6be2f073233be19f632..dd4b4981d8b999314b6ef723a9f12daab79f914a 100644 --- a/Tables/Input/ts/nav40.ktb +++ b/Tables/Input/ts/nav40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/nav80.ktb b/Tables/Input/ts/nav80.ktb index f7e05283b558538bb6a67bbd329be0ba9cec5f2a..fa63c977c6e2ab1c35719f7d718b3c698fd073f9 100644 --- a/Tables/Input/ts/nav80.ktb +++ b/Tables/Input/ts/nav80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/nav_large.kti b/Tables/Input/ts/nav_large.kti index 4191597ae717cc25fc97f1f88b10317331932d82..ef147294fcc640b4f192e134c901cb28c6e5b77d 100644 --- a/Tables/Input/ts/nav_large.kti +++ b/Tables/Input/ts/nav_large.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/nav_small.kti b/Tables/Input/ts/nav_small.kti index 1a6cc7a3bcb65fc0811f652311bab3a1835d4dad..a9900d9e9f874896e694aab242fa61675aeb864e 100644 --- a/Tables/Input/ts/nav_small.kti +++ b/Tables/Input/ts/nav_small.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/pb.kti b/Tables/Input/ts/pb.kti index 4d71949e7bb2abff0b9081b50d2553d8b2a94ab3..065610b482e0618ceb9439d21c4ddcaec25ae72e 100644 --- a/Tables/Input/ts/pb.kti +++ b/Tables/Input/ts/pb.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/pb40.ktb b/Tables/Input/ts/pb40.ktb index 74a60e4501637e1b7a21421ce8e897cd09494a93..2c3932e370077f50b3dfe8e4229a838c39835c67 100644 --- a/Tables/Input/ts/pb40.ktb +++ b/Tables/Input/ts/pb40.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/pb65.ktb b/Tables/Input/ts/pb65.ktb index 998e270f9b434d0e0591d0a5199dc7f7604342a6..0923d283a967f7f3c7a71c48ce7f46591f5f37a6 100644 --- a/Tables/Input/ts/pb65.ktb +++ b/Tables/Input/ts/pb65.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/pb80.ktb b/Tables/Input/ts/pb80.ktb index 14d0ea95e6deb1905de52b99ed8319c5da645872..268985e81f084f381c3bd23c37650426afadd061 100644 --- a/Tables/Input/ts/pb80.ktb +++ b/Tables/Input/ts/pb80.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/pb_large.kti b/Tables/Input/ts/pb_large.kti index cf6478e7fda29cdb75fd9d8ef8ee8494006df1df..8509fc9eedf2ff352c95876d397e6cdcb59b2ad5 100644 --- a/Tables/Input/ts/pb_large.kti +++ b/Tables/Input/ts/pb_large.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/pb_small.kti b/Tables/Input/ts/pb_small.kti index f0659a6d6e0a7a471b198e1c59bd30e37feeba86..b635f8be8c61c054148a7087ce06c22e75f2b132 100644 --- a/Tables/Input/ts/pb_small.kti +++ b/Tables/Input/ts/pb_small.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ts/routing.kti b/Tables/Input/ts/routing.kti index 75375f09331274dad071c567704477567cb07c8d..38c636e05c6d9ae02fcde8a97d1a28d839fa000c 100644 --- a/Tables/Input/ts/routing.kti +++ b/Tables/Input/ts/routing.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/vo/all.ktb b/Tables/Input/vo/all.ktb index f5427ecc49f90bf146aace103407e9c1646b1006..0c848fe583a1c8ab83e0c2b7f2f267aecfed1b7a 100644 --- a/Tables/Input/vo/all.ktb +++ b/Tables/Input/vo/all.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/vo/all.kti b/Tables/Input/vo/all.kti index 7dbdc513359ce8e7c4e090f30c9bf355f8d7c2ba..e9955a93e278d0a61e8801b031aad98d10f861f8 100644 --- a/Tables/Input/vo/all.kti +++ b/Tables/Input/vo/all.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/vo/bp.ktb b/Tables/Input/vo/bp.ktb index 474d17e8cc429a3962cda45f3174169ec7a3d539..29f719f064d7a4fe0b200b07f711a27b771ff6f5 100644 --- a/Tables/Input/vo/bp.ktb +++ b/Tables/Input/vo/bp.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/braille.ktb b/Tables/Keyboard/braille.ktb index 0ba059a83c39a48e117104ef9877518ffd3d4571..6e1178a380f9a3d989c1d2a7e9ea94b7cb95733d 100644 --- a/Tables/Keyboard/braille.ktb +++ b/Tables/Keyboard/braille.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/braille.kti b/Tables/Keyboard/braille.kti index 09f2e3f10803e180e2a5c35819d8e50375209507..6c3a04fda587c59b040192f3845cf54ae9709ca3 100644 --- a/Tables/Keyboard/braille.kti +++ b/Tables/Keyboard/braille.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/desktop.ktb b/Tables/Keyboard/desktop.ktb index 008d458ae1708c33e8107fa3220fde497a5bdd83..259d5c2030102836eddf668995ae08b272857670 100644 --- a/Tables/Keyboard/desktop.ktb +++ b/Tables/Keyboard/desktop.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/desktop.kti b/Tables/Keyboard/desktop.kti index ac1ee3b21e97b4d9308eef3baa1ce4b19fb605e7..54ce83672bef0aae0af1f6033be8e68337ecc4f5 100644 --- a/Tables/Keyboard/desktop.kti +++ b/Tables/Keyboard/desktop.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/keypad.ktb b/Tables/Keyboard/keypad.ktb index 0738288ee46901307de1a6a0cf1b611b1d5d6fac..bd814980e30d9ddb376465c4f046a3c8e1019503 100644 --- a/Tables/Keyboard/keypad.ktb +++ b/Tables/Keyboard/keypad.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/kp_say.kti b/Tables/Keyboard/kp_say.kti index c0d24cf8648ba8ce74f797b45047bb714c7ab2e9..34545b3ee27112447f836adea6c9959b6dc25df1 100644 --- a/Tables/Keyboard/kp_say.kti +++ b/Tables/Keyboard/kp_say.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/kp_speak.kti b/Tables/Keyboard/kp_speak.kti index 26337567fc5e8dbf1b6cf0809ff8cdcac0ef7774..98c992ab5b81aaa05bacd6223a7b34b2a45e3efe 100644 --- a/Tables/Keyboard/kp_speak.kti +++ b/Tables/Keyboard/kp_speak.kti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/laptop.ktb b/Tables/Keyboard/laptop.ktb index 6d74716f31b84aa06b9150fdfa255fa0939d2ad9..6121906ce34cbcc08302f8b354440e5000a19e98 100644 --- a/Tables/Keyboard/laptop.ktb +++ b/Tables/Keyboard/laptop.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/sun_type6.ktb b/Tables/Keyboard/sun_type6.ktb index 9a8dac0a3638af4705f6903e708d5de44224e469..53f14b9f6730b656335efecf2ae08e6c26536429 100644 --- a/Tables/Keyboard/sun_type6.ktb +++ b/Tables/Keyboard/sun_type6.ktb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ar.ttb b/Tables/Text/ar.ttb index 3f14bdc9d3a3d522055a704d0882a6465c9c5bef..6ede7ca3bc0bdf7ec0606aeb4855bbc7669009be 100644 --- a/Tables/Text/ar.ttb +++ b/Tables/Text/ar.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/as.ttb b/Tables/Text/as.ttb index dbe9765902a310be73571a1ea66e4fd365b3a989..2c9e6706a4f6ea75dcd34549cb1d0580d425d29f 100644 --- a/Tables/Text/as.ttb +++ b/Tables/Text/as.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ascii-basic.tti b/Tables/Text/ascii-basic.tti index 85b5e1d67e2337330d08b9191fcec1a042207b38..b93ef04a34e7e4bb461992e71e0268e45f8fb678 100644 --- a/Tables/Text/ascii-basic.tti +++ b/Tables/Text/ascii-basic.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/awa.ttb b/Tables/Text/awa.ttb index 7d3593ba761b02b0c80f80a299247fed425ad5b2..0eddaa6ea34a42fa6e9adf02d039d96a5d27cfe1 100644 --- a/Tables/Text/awa.ttb +++ b/Tables/Text/awa.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bengali.tti b/Tables/Text/bengali.tti index b15951c3776f29b74b73eabc0d1acb19c7301673..44bef11852ad5926043cdb7303f7defcad9f2df3 100644 --- a/Tables/Text/bengali.tti +++ b/Tables/Text/bengali.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bg.ttb b/Tables/Text/bg.ttb index 4f3ade7032f6d10e1cb39dd036f9454ba42d061d..5935a79c8129f244dce0226497bcaf475dbb90bd 100644 --- a/Tables/Text/bg.ttb +++ b/Tables/Text/bg.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bh.ttb b/Tables/Text/bh.ttb index a28534a2f6c417baa23be9bae9d107cad2a01bf8..33d18ecdf3580a0b5e125436671fe4637d180598 100644 --- a/Tables/Text/bh.ttb +++ b/Tables/Text/bh.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/blocks.tti b/Tables/Text/blocks.tti index c8fd8818036219eadfe69063ddb286dff6e8de4e..abbcb3fe695a16ef0e88f16e62cac3e8e6ddd1ee 100644 --- a/Tables/Text/blocks.tti +++ b/Tables/Text/blocks.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bn.ttb b/Tables/Text/bn.ttb index 00466729bf42d61750b8030b5393809ff5c42165..8687bd070c41e1d868794ac9b5e3ba3f4dfcab62 100644 --- a/Tables/Text/bn.ttb +++ b/Tables/Text/bn.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bo.ttb b/Tables/Text/bo.ttb index be59a13b5e641fa1e7317aa636cb682248318fbb..31dd7ee9487b9c8385f849db91d81d58db01bad2 100644 --- a/Tables/Text/bo.ttb +++ b/Tables/Text/bo.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/boxes.tti b/Tables/Text/boxes.tti index f0dee02a8788563c5d7114224b2b12488d963615..476a828b98d2f8dcf13ba48d74f5db759aca066a 100644 --- a/Tables/Text/boxes.tti +++ b/Tables/Text/boxes.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bra.ttb b/Tables/Text/bra.ttb index f9e857771a9c25a12c8059e47a2771561993cd56..0b72d6db1f94935edf3be21464fb8bb724fa5db6 100644 --- a/Tables/Text/bra.ttb +++ b/Tables/Text/bra.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/brf.ttb b/Tables/Text/brf.ttb index 9f4f8a319971379ecc81f80c95f3ab00a6f4cc50..c881304e5ca086842604a6718cb39ea8ff007179 100644 --- a/Tables/Text/brf.ttb +++ b/Tables/Text/brf.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/common.tti b/Tables/Text/common.tti index 4b0a40442db8deffdfdd7549e050af5445785fba..f7ae67551060c19a10b6c2f7cfe670be345b8c69 100644 --- a/Tables/Text/common.tti +++ b/Tables/Text/common.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/cs.ttb b/Tables/Text/cs.ttb index 844892b43ab5ea9914f2f9e3f911af8b70b1152d..a4292237b7f15b6beba9eb93fc20febe2716de21 100644 --- a/Tables/Text/cs.ttb +++ b/Tables/Text/cs.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ctl-latin.tti b/Tables/Text/ctl-latin.tti index dda10506aa1b9b01ec2c84d77fc1a7dfeaed3007..bbaf0dcfb30fd5dd37a771a220889a0a437deba5 100644 --- a/Tables/Text/ctl-latin.tti +++ b/Tables/Text/ctl-latin.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/cy.ttb b/Tables/Text/cy.ttb index e832c3486fe71daaa5a1362fa192ff139a8a6a26..d34e887055d2bf522d1be5aa8434c8ac50e36ddd 100644 --- a/Tables/Text/cy.ttb +++ b/Tables/Text/cy.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/da-1252.ttb b/Tables/Text/da-1252.ttb index 241130b01d697dd2db60952a5f487dd2a2113558..a5231895a19554b1c8c2ee0edb20d02b4405f2e3 100644 --- a/Tables/Text/da-1252.ttb +++ b/Tables/Text/da-1252.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/da-lt.ttb b/Tables/Text/da-lt.ttb index def58c870ac7f3b33c77e6874d57406d1f9285c3..6391fea64dbcdca43d3f7252af029d11444cc296 100644 --- a/Tables/Text/da-lt.ttb +++ b/Tables/Text/da-lt.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/da.ttb b/Tables/Text/da.ttb index 075d1427ee33c88159595ee5922e3634eefeb8d7..883cd2f2b8150080417d07ad02812a6a8e2a75f0 100644 --- a/Tables/Text/da.ttb +++ b/Tables/Text/da.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/de-chess.tti b/Tables/Text/de-chess.tti index 817870c874b066ab25b18d1d09bb707646f7ad1f..55d015d9caa83ef7af0a9c854ec3c2b6304a1b41 100644 --- a/Tables/Text/de-chess.tti +++ b/Tables/Text/de-chess.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/de.ttb b/Tables/Text/de.ttb index ed0acdf9ee490b34ece0876d7820d896f4cf1beb..bbbc68d8fff7a2aba2cc65302fbe2992ef486095 100644 --- a/Tables/Text/de.ttb +++ b/Tables/Text/de.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/devanagari.tti b/Tables/Text/devanagari.tti index 34b8d338882b6594ad1e85cf2dc7f1bc76efc6d2..29c301ef1897f74585b1cf25d38b54ad23382168 100644 --- a/Tables/Text/devanagari.tti +++ b/Tables/Text/devanagari.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/dra.ttb b/Tables/Text/dra.ttb index 92942eaa77ba69cc7ba2af3325b2393097d6af72..68857f7ed01c424a49ea99dffbf6032819e42458 100644 --- a/Tables/Text/dra.ttb +++ b/Tables/Text/dra.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/el.ttb b/Tables/Text/el.ttb index 08103c329398891df8bd270e8fffc78a6d8c521c..3a0c740b062dae0a3bd5e5a2d44d6faebaa2ae72 100644 --- a/Tables/Text/el.ttb +++ b/Tables/Text/el.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en-chess.tti b/Tables/Text/en-chess.tti index 0be87e77ff01df6d07f7c49150693cfa7347fb7b..06e644cdd81d41b8b2fdb19c7d449702e82b98af 100644 --- a/Tables/Text/en-chess.tti +++ b/Tables/Text/en-chess.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en-na-ascii.tti b/Tables/Text/en-na-ascii.tti index 7688de12c78c1cceeeb3219349311caa86c16eef..aa772a98469e22591abc5319e125a3d61f789d8b 100644 --- a/Tables/Text/en-na-ascii.tti +++ b/Tables/Text/en-na-ascii.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en-nabcc.ttb b/Tables/Text/en-nabcc.ttb index 784e2fd144906f4e7331b470f60589bb62d52002..9939ae1f74a86e6cc5b73c17c90e0f7634d96700 100644 --- a/Tables/Text/en-nabcc.ttb +++ b/Tables/Text/en-nabcc.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en.ttb b/Tables/Text/en.ttb index 1f203adde8cf5db640b8499fff375274aaaa4eb6..b5d58b7561678f4edfe2ccbedcc8de73fcdc2c45 100644 --- a/Tables/Text/en.ttb +++ b/Tables/Text/en.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en_CA.ttb b/Tables/Text/en_CA.ttb index 98669c0992c8a5acc281eb1b67462a9aa6938388..5b0dee32091e118a002caa9dd30df6c4b6950ca1 100644 --- a/Tables/Text/en_CA.ttb +++ b/Tables/Text/en_CA.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -86,8 +86,8 @@ char \xB1 ( 34 67 ) # ⡬ ± [PLUS-MINUS SIGN] char \xD7 (1 67 ) # â¡¡ × [MULTIPLICATION SIGN] char \xF7 ( 34 7 ) # â¡Œ ÷ [DIVISION SIGN] char \u2260 (1234567 ) # â¡¿ ≠ [NOT EQUAL TO] -char \u2264 ( 345 7 ) # â¡œ ≤ [LESS-THAN OR EQUAL TO] -char \u2265 (12 67 ) # â¡£ ≥ [GREATER-THAN OR EQUAL TO] +char \u2264 (12 67 ) # â¡£ ≤ [LESS-THAN OR EQUAL TO] +char \u2265 ( 345 7 ) # â¡œ ≥ [GREATER-THAN OR EQUAL TO] char \xA2 (12 4 67 ) # â¡« ¢ [CENT SIGN] char \xA3 ( 34567 ) # ⡼ £ [POUND SIGN] diff --git a/Tables/Text/en_GB.ttb b/Tables/Text/en_GB.ttb index 3d1161582bfa83b7158630dab2d5102457194ae3..8ae217a28778921e5b56fc94d04b37ac40facb68 100644 --- a/Tables/Text/en_GB.ttb +++ b/Tables/Text/en_GB.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en_US.ttb b/Tables/Text/en_US.ttb index 9845b58cd7dcb7b29965544a653d7c7a341dcfdc..88f2dabc1e2e912eb4592998b521fe983507c65f 100644 --- a/Tables/Text/en_US.ttb +++ b/Tables/Text/en_US.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/eo.ttb b/Tables/Text/eo.ttb index 0db2e9d7f8ac8971f7e58fd5beb254b34ee2bb5a..11cdf2592cf621f135cc4db8034a44d02aa6a5b5 100644 --- a/Tables/Text/eo.ttb +++ b/Tables/Text/eo.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/es.ttb b/Tables/Text/es.ttb index 5d2fbd44a4c0553f542b89c7419ec54d5b14c23a..192a5aa9fc6a096c35303b8536813bbd343fc961 100644 --- a/Tables/Text/es.ttb +++ b/Tables/Text/es.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/et.ttb b/Tables/Text/et.ttb index cf76105d42d3505ef6cf833005e8eb8e05ae1357..28ff67ad072ac6eeb7d08fc156a09f0c5381585e 100644 --- a/Tables/Text/et.ttb +++ b/Tables/Text/et.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fi.ttb b/Tables/Text/fi.ttb index d41871a1f13e430f2eda10e2c781f4e991439498..4a934655928d31f16559fd9d62689cf0fcda9ce6 100644 --- a/Tables/Text/fi.ttb +++ b/Tables/Text/fi.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr-2007.ttb b/Tables/Text/fr-2007.ttb index 1f6ae6b5b1bce74370561856c9892e770e3f4cc1..a3df237b03617043ff57a29d66748180ce1c97d8 100644 --- a/Tables/Text/fr-2007.ttb +++ b/Tables/Text/fr-2007.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr-cbifs.ttb b/Tables/Text/fr-cbifs.ttb index bfe318e699f9270338722b5b5a9cdd96d369e439..e7e328d08d32acbd31ec60855641746ec3a5628a 100644 --- a/Tables/Text/fr-cbifs.ttb +++ b/Tables/Text/fr-cbifs.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr-vs.ttb b/Tables/Text/fr-vs.ttb index d327751ad595e5aeac9c019a1748b6b81d83bf73..2b18d75ff06cba7adbf9a2ca8edfcef4699bde32 100644 --- a/Tables/Text/fr-vs.ttb +++ b/Tables/Text/fr-vs.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr.ttb b/Tables/Text/fr.ttb index 8eb9e92d2a742ca504059434961359beaf684f56..7b7e9096021bddf1cd290afb413fcfa02473b5c0 100644 --- a/Tables/Text/fr.ttb +++ b/Tables/Text/fr.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr_CA.ttb b/Tables/Text/fr_CA.ttb index a4af0ab825b59bd37c3ed49c042aaeb06d519f57..542d88f596b1262dc719b06418c3b9e2fc136e41 100644 --- a/Tables/Text/fr_CA.ttb +++ b/Tables/Text/fr_CA.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr_FR.ttb b/Tables/Text/fr_FR.ttb index b0296f7226c7499943248ec4ad35a160b15506c7..c8ea929a117de8e53922eac4b05733e9a195643b 100644 --- a/Tables/Text/fr_FR.ttb +++ b/Tables/Text/fr_FR.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ga.ttb b/Tables/Text/ga.ttb index 2874d4c76bc6b5674bf4d2261a507b542a4d4066..e8da38a801b981977422674403c76266fa46e170 100644 --- a/Tables/Text/ga.ttb +++ b/Tables/Text/ga.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gd.ttb b/Tables/Text/gd.ttb index 816745f824893d1594e5dd14845fdb086d533438..d69fe90aece489d99404eee278ab7391d5b066d2 100644 --- a/Tables/Text/gd.ttb +++ b/Tables/Text/gd.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gon.ttb b/Tables/Text/gon.ttb index c557fffe831775c4d319cf00b100e4d62164c319..074a53010d3b8aded3881cd6f93f667b741fd7bc 100644 --- a/Tables/Text/gon.ttb +++ b/Tables/Text/gon.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gu.ttb b/Tables/Text/gu.ttb index f87fb721b914ae8df90d96399ec19458275909b5..70eb2c9fa4fd4800e346c401a7bddf0295e1993f 100644 --- a/Tables/Text/gu.ttb +++ b/Tables/Text/gu.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gujarati.tti b/Tables/Text/gujarati.tti index e32403cbce22e734b3e428d78f10a5faa583e717..966dc013d5c394b47232adae78bd42936f50bab8 100644 --- a/Tables/Text/gujarati.tti +++ b/Tables/Text/gujarati.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gurmukhi.tti b/Tables/Text/gurmukhi.tti index 6cf58616fc5a771d3e7fc020cfb362ceb059d33b..82e5e92857349644cf0208c7067f69ec67a2e9e8 100644 --- a/Tables/Text/gurmukhi.tti +++ b/Tables/Text/gurmukhi.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/he.ttb b/Tables/Text/he.ttb index c0aa4046596dc86267e4e409eb50386beb2f7a4d..92ee3f8a1228725ec7702ca0472e2b9d889962c4 100644 --- a/Tables/Text/he.ttb +++ b/Tables/Text/he.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hi.ttb b/Tables/Text/hi.ttb index 1bd98241c077bcce3d4d66ea127b40183d4b8391..64c3fa200d665ee185be9578b4bdc8eccd1e0baa 100644 --- a/Tables/Text/hi.ttb +++ b/Tables/Text/hi.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hr.ttb b/Tables/Text/hr.ttb index 3f7a4252db3a3df925e26b01160b6e4c1f984d08..c2fe839808d3b3860c88cfd39f99f8d792fd2f80 100644 --- a/Tables/Text/hr.ttb +++ b/Tables/Text/hr.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hu.ttb b/Tables/Text/hu.ttb index 66f27bec6dba1f1d6744cbd00cd13fc9cb40d1bf..18d8383518a03756b253c214a25b36722a159559 100644 --- a/Tables/Text/hu.ttb +++ b/Tables/Text/hu.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hy.ttb b/Tables/Text/hy.ttb index 452e159c192891fe55ab5990f89d72831a25adaa..37e75323d42a2c1f74a2ff3906ac093058c00dce 100644 --- a/Tables/Text/hy.ttb +++ b/Tables/Text/hy.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/is.ttb b/Tables/Text/is.ttb index ac26d013bdeb049ab888f286ca9729186672a265..73f0d20725498ad1db7df29db3aa15cf09ee8f5d 100644 --- a/Tables/Text/is.ttb +++ b/Tables/Text/is.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/it.ttb b/Tables/Text/it.ttb index 8e410aa3f3f767a54b5fe08ebbca3b35154b8263..503d3d545e1adf798e9ff4afcb7f703d66112011 100644 --- a/Tables/Text/it.ttb +++ b/Tables/Text/it.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kannada.tti b/Tables/Text/kannada.tti index 7ab24caf70c6cbc3cd5d25ed053f90cdd4ea81b0..18aee998341f1496c72c1d52c7961863159adf65 100644 --- a/Tables/Text/kannada.tti +++ b/Tables/Text/kannada.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kha.ttb b/Tables/Text/kha.ttb index 8849a782bcbc8fad4807464ddbe54340d34fd4c7..c7ed341fccd9f29b7fe891b01d8ee7ddd9256775 100644 --- a/Tables/Text/kha.ttb +++ b/Tables/Text/kha.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kn.ttb b/Tables/Text/kn.ttb index 810608aee64d2c87272b0f188af6d54b293b3af5..abc4b08f9cf98c9d5d8e755648df12f677079d1c 100644 --- a/Tables/Text/kn.ttb +++ b/Tables/Text/kn.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kok.ttb b/Tables/Text/kok.ttb index 07f3dbebe45d9d6c7431a88162452efc43f3c879..8e31a8bafe887539c27667121ac36d283620fde7 100644 --- a/Tables/Text/kok.ttb +++ b/Tables/Text/kok.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kru.ttb b/Tables/Text/kru.ttb index 586c2554e988c8d1ccf3e1c9ecea181b9e26b154..69280a454a0b3d8cd273d868fb7c7634ed6e0c71 100644 --- a/Tables/Text/kru.ttb +++ b/Tables/Text/kru.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/lt.ttb b/Tables/Text/lt.ttb index 3c2aa832630fa44a671d9ec9372e99146b9ccf67..32700ea6d9653c804d54f9b0a80675e62a46a886 100644 --- a/Tables/Text/lt.ttb +++ b/Tables/Text/lt.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ltr-alias.tti b/Tables/Text/ltr-alias.tti index 721b43e44016e127c7cfd69f0f0cb914e03a661d..32368f9def3dc498b00a62208a0d647ce7051436 100644 --- a/Tables/Text/ltr-alias.tti +++ b/Tables/Text/ltr-alias.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ltr-cyrillic.tti b/Tables/Text/ltr-cyrillic.tti index a16afd6d92afa76c224ea5858a3459d6568b0d51..2239101fa7907bfd9593701a5e6d4d6a54c5ee34 100644 --- a/Tables/Text/ltr-cyrillic.tti +++ b/Tables/Text/ltr-cyrillic.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ltr-dot8.tti b/Tables/Text/ltr-dot8.tti index 8317ad50a4ed2e55d99210a8a4fa8b7e213ad542..28e260067cb6973dfa5a8273b5855cfdccd97ac5 100644 --- a/Tables/Text/ltr-dot8.tti +++ b/Tables/Text/ltr-dot8.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ltr-latin.tti b/Tables/Text/ltr-latin.tti index f0eb2b90ae4110f96edc1771c80eafaf7cd6dca0..f4dcc3258eb5d93667c719aa9af8d59b8bdd1454 100644 --- a/Tables/Text/ltr-latin.tti +++ b/Tables/Text/ltr-latin.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ltr-tibetan.tti b/Tables/Text/ltr-tibetan.tti index 9f80c16851335a610973a1197e6fd070a28dca0f..3527e4cef62d88688c163ebf28acf6d38a46b278 100644 --- a/Tables/Text/ltr-tibetan.tti +++ b/Tables/Text/ltr-tibetan.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/lv.ttb b/Tables/Text/lv.ttb index f7df46f24dac4151ec8361ffc4ad8a9fe06c0058..3449aaa64c3d8081a6cd8139e72f3ac613ab5ba2 100644 --- a/Tables/Text/lv.ttb +++ b/Tables/Text/lv.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/malayalam.tti b/Tables/Text/malayalam.tti index 4b05c115ca711232206802c35496a6d7c3a2d9ad..5c5305ff5366c3547ae457649700a2031280a80c 100644 --- a/Tables/Text/malayalam.tti +++ b/Tables/Text/malayalam.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mg.ttb b/Tables/Text/mg.ttb index cbfd4bd04810c2ec18e99480898fd7242ff21068..f632152c53bd3b9f39044f2ba0aedd3b0a2cf389 100644 --- a/Tables/Text/mg.ttb +++ b/Tables/Text/mg.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mi.ttb b/Tables/Text/mi.ttb index 401df620233cfae538d204c3f315a7eb5d536857..1df7c5b48f09b165be223cb3843ab4ceddd32212 100644 --- a/Tables/Text/mi.ttb +++ b/Tables/Text/mi.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ml.ttb b/Tables/Text/ml.ttb index f01d7045b9ff3862bf93a0a186eb175766758638..a6dfb2433cf5ba40389a81a3a3aab7c60aa554c3 100644 --- a/Tables/Text/ml.ttb +++ b/Tables/Text/ml.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mni.ttb b/Tables/Text/mni.ttb index 2111c4acff1036b51a2beeab62150d2bc004a9fa..e0ff5070317b10acddeee060e70e37a2a04a6bc4 100644 --- a/Tables/Text/mni.ttb +++ b/Tables/Text/mni.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mr.ttb b/Tables/Text/mr.ttb index e58b915e5ae8d8c1fd4824cfbc510251b4424956..4b829611d6b60b076a1f4fc72d35eab9b633b133 100644 --- a/Tables/Text/mr.ttb +++ b/Tables/Text/mr.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mt.ttb b/Tables/Text/mt.ttb index 7eb0ec7a05dc11c34aa466c1e68d01e08b200445..4072f5d13b1869884c8dbc437c6ac701d2ce4da0 100644 --- a/Tables/Text/mt.ttb +++ b/Tables/Text/mt.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mun.ttb b/Tables/Text/mun.ttb index c95ecfd940ff2626307a7a46c74c7ef664cd8f4a..4d290d35fa2787b7c79e770b9a389fc42f0f17cb 100644 --- a/Tables/Text/mun.ttb +++ b/Tables/Text/mun.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mwr.ttb b/Tables/Text/mwr.ttb index 78e407e4754c65b2643026bfb0d392e5141574a4..c78cebe1402d90e350ef7d09b5cc68b3f2824d86 100644 --- a/Tables/Text/mwr.ttb +++ b/Tables/Text/mwr.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ne.ttb b/Tables/Text/ne.ttb index 61cade58651667595f0da3c63e9c0f596e49cf39..a31c06873f8507287014cb5f35bb28b966c510f9 100644 --- a/Tables/Text/ne.ttb +++ b/Tables/Text/ne.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/new.ttb b/Tables/Text/new.ttb index ce03610be95e8f23a92385a4cf49059439b40559..6fe3e4934cac3c6e4b8e08e51e51ea83c834dd80 100644 --- a/Tables/Text/new.ttb +++ b/Tables/Text/new.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/nl.ttb b/Tables/Text/nl.ttb index f6f073f39c7f9e9f94e42a3e4019062354b6e6ca..bc50e9233c422f5d8416b63ff71ffd9f2dd90f9a 100644 --- a/Tables/Text/nl.ttb +++ b/Tables/Text/nl.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/nl_BE.ttb b/Tables/Text/nl_BE.ttb index c71104e891297b57cbd7729ca2a6942ec1cc891d..fe171436527e5052ce1e37871cf1912804c1b4e8 100644 --- a/Tables/Text/nl_BE.ttb +++ b/Tables/Text/nl_BE.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/nl_NL.ttb b/Tables/Text/nl_NL.ttb index 97a0b1610b07b7976766bd4d1467dd030c2ead22..d8a629c4a3103fb06eed1c805f423395ea5b094e 100644 --- a/Tables/Text/nl_NL.ttb +++ b/Tables/Text/nl_NL.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/no-generic.ttb b/Tables/Text/no-generic.ttb index 37ad630cd5e183c92d4cc503d4e2e6b0cf05fc67..fb90d0b9be5ea8474f58922a4969534e18cdf607 100644 --- a/Tables/Text/no-generic.ttb +++ b/Tables/Text/no-generic.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/no-oup.ttb b/Tables/Text/no-oup.ttb index 6099a461028e86dd73e76812c1839d8ac9436bca..e9903f193b428d7b9dec346308c07e8030437dcc 100644 --- a/Tables/Text/no-oup.ttb +++ b/Tables/Text/no-oup.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/no.ttb b/Tables/Text/no.ttb index 202b97af4d35658ff38bd7cbb5f880507a6051e9..f26f734d0b36005e682f92c6791c25ed86a767bc 100644 --- a/Tables/Text/no.ttb +++ b/Tables/Text/no.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/num-alias.tti b/Tables/Text/num-alias.tti index 3fd432d074494b429d1d9b54861275b736b17f1f..6329024a8b5a2a56fb621da57cbccc9be863177f 100644 --- a/Tables/Text/num-alias.tti +++ b/Tables/Text/num-alias.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/num-dot6.tti b/Tables/Text/num-dot6.tti index d6e9ecb3fbf01d75aeb0ec1b3c56c22440e7679c..5a3c2fc9bd459d28f56707228b1b71d147087ad9 100644 --- a/Tables/Text/num-dot6.tti +++ b/Tables/Text/num-dot6.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/num-dot8.tti b/Tables/Text/num-dot8.tti index d1dd40e9fd16df8d3d9bb5ce51966acace913b5f..3b22687d9f6bb1486ce6a7c5217249b0b5d96339 100644 --- a/Tables/Text/num-dot8.tti +++ b/Tables/Text/num-dot8.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/num-french.tti b/Tables/Text/num-french.tti index b0af93ac083fdd30b03fc25a873d92a9594d6af0..5ed95ab1c910e6f5daa2da5c38a209976dbc75ab 100644 --- a/Tables/Text/num-french.tti +++ b/Tables/Text/num-french.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/num-nemd8.tti b/Tables/Text/num-nemd8.tti index e67f58b6b278f3bfccc9fb91bb317f195afd3c59..37df803a46abf5e55f025a9db33c381dabceef60 100644 --- a/Tables/Text/num-nemd8.tti +++ b/Tables/Text/num-nemd8.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/num-nemeth.tti b/Tables/Text/num-nemeth.tti index 940b8770443f68b99f8420bc322112079d2adfca..df792c6e84855ca3404ec4000a40b0003c2360e2 100644 --- a/Tables/Text/num-nemeth.tti +++ b/Tables/Text/num-nemeth.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/nwc.ttb b/Tables/Text/nwc.ttb index b5ce61b7be1dc0439e2db079944b16ef0903abd3..d6633d0e01afca1c5122090c75e4a0ebae305b58 100644 --- a/Tables/Text/nwc.ttb +++ b/Tables/Text/nwc.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/or.ttb b/Tables/Text/or.ttb index 99f0adf25017907542019c7f1f176d2a90359130..cc14a7cc3be4cc66ad3cf4d930c6d4eb4f28ccb1 100644 --- a/Tables/Text/or.ttb +++ b/Tables/Text/or.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/oriya.tti b/Tables/Text/oriya.tti index 27a928fd92000551818ce0c2d141bda78681be42..4b6f9955593b544e4b3715111420737cdae73b1e 100644 --- a/Tables/Text/oriya.tti +++ b/Tables/Text/oriya.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pa.ttb b/Tables/Text/pa.ttb index 2f9aa952296b09ee1ed4df9fdcd9b2e6f9d77654..e87531ec9609c6a6c148bfa305a3902774fca666 100644 --- a/Tables/Text/pa.ttb +++ b/Tables/Text/pa.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pi.ttb b/Tables/Text/pi.ttb index 0d062b1c2994731a301805d79c52fef9ab343211..53bddbb02d26c47c0010bc60b5fe3ec4b67c7d70 100644 --- a/Tables/Text/pi.ttb +++ b/Tables/Text/pi.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pl.ttb b/Tables/Text/pl.ttb index ee0e976310d7ed75f2393588f751b2a7b1d08dd4..0577e61713bd998e4f358fd2439bfc09e6e40936 100644 --- a/Tables/Text/pl.ttb +++ b/Tables/Text/pl.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pt.ttb b/Tables/Text/pt.ttb index cfa08597c1024e0f95c0f351a7505db877edbd6a..fe753afd8eba513480ff47ca88d23bd191a32278 100644 --- a/Tables/Text/pt.ttb +++ b/Tables/Text/pt.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/punc-alternate.tti b/Tables/Text/punc-alternate.tti index 0dca79e556ac890b85a3992636f6ef99d21f3527..02a6f6b47e7b8710d92b858a143142d3066e8a62 100644 --- a/Tables/Text/punc-alternate.tti +++ b/Tables/Text/punc-alternate.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/punc-basic.tti b/Tables/Text/punc-basic.tti index 223e49d6c52817f9c701ef6872eb6e447812af22..cb6e5a118b8542abf307d436efa3a0562e1c4cc3 100644 --- a/Tables/Text/punc-basic.tti +++ b/Tables/Text/punc-basic.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/punc-tibetan.tti b/Tables/Text/punc-tibetan.tti index ac20a68ef0d4d38cee4b1d202769ee859134e6fa..7ac8c627b7a75fc5ab8e7ee025e28b635b2378d7 100644 --- a/Tables/Text/punc-tibetan.tti +++ b/Tables/Text/punc-tibetan.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ro.ttb b/Tables/Text/ro.ttb index d2c7cf9611f493aec76a7b66b408926616140560..e60a8098464ff10011f0cc112e39790cdb87f773 100644 --- a/Tables/Text/ro.ttb +++ b/Tables/Text/ro.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ru.ttb b/Tables/Text/ru.ttb index 8b1d9b66443f2d397bb233bdb4f1f9b7a4a78c5c..883bdcd954fa81d5a801f649cf239974b36d1b0e 100644 --- a/Tables/Text/ru.ttb +++ b/Tables/Text/ru.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sa.ttb b/Tables/Text/sa.ttb index 41bb93734ec5eefecb443cf75fead5e6a15f67f4..991be253aea091425df398c48e508d22db956bd9 100644 --- a/Tables/Text/sa.ttb +++ b/Tables/Text/sa.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sat.ttb b/Tables/Text/sat.ttb index 0be2f7c44811a0e79a6b9280ec07681ae7c8859e..fe751fa7d368d422e509325d87b58ca06e65bc52 100644 --- a/Tables/Text/sat.ttb +++ b/Tables/Text/sat.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sd.ttb b/Tables/Text/sd.ttb index 38ed841d8abee8c6af907927db37a21c3191e8a3..5cc9ee01e6df6716db123d6a93ce142c76d55ca3 100644 --- a/Tables/Text/sd.ttb +++ b/Tables/Text/sd.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sk.ttb b/Tables/Text/sk.ttb index 4bffc2011faaf455ef2ddfb44963e5ab750daf2d..43fde7c76af9888a73bfa5b0c6f1be74495c3d07 100644 --- a/Tables/Text/sk.ttb +++ b/Tables/Text/sk.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sl.ttb b/Tables/Text/sl.ttb index 1c015d60e934ac5d161d983da956df98bddd997f..cd66e2401794c0b0d6864c843d70c2de5a214fec 100644 --- a/Tables/Text/sl.ttb +++ b/Tables/Text/sl.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/spaces.tti b/Tables/Text/spaces.tti index 489adce4368ee36f240b843e7fdada3f5a30d3ad..f4363792006fdc00ceeb7b20973f1ddcaedf40cc 100644 --- a/Tables/Text/spaces.tti +++ b/Tables/Text/spaces.tti @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sv-1989.ttb b/Tables/Text/sv-1989.ttb index 2f16a8889e795ce02c838f535a3ee6680f8ef99d..755c2992416429ed3a0fe40c656b60d757bae877 100644 --- a/Tables/Text/sv-1989.ttb +++ b/Tables/Text/sv-1989.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sv-1996.ttb b/Tables/Text/sv-1996.ttb index 585d7fc0a41f472095ba42d03ce1b068aa2092c6..992a1f5d16f4328b5ed954f79b9d24806bc5134c 100644 --- a/Tables/Text/sv-1996.ttb +++ b/Tables/Text/sv-1996.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sv.ttb b/Tables/Text/sv.ttb index 10c8a42405ef893f635215513b8d8e25c49a7076..426a86e5f2340e79439bb6a3e38b98eea5249eca 100644 --- a/Tables/Text/sv.ttb +++ b/Tables/Text/sv.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sw.ttb b/Tables/Text/sw.ttb index 639c9d9485b3fa8ed1dc3ca6163bf11d9a4b888d..22b0c9d4600b5c53a53a44b6de9d2559a9eee9ca 100644 --- a/Tables/Text/sw.ttb +++ b/Tables/Text/sw.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ta.ttb b/Tables/Text/ta.ttb index 685a53e7cecfc916c70cfb920802dd871aca7153..1b2f439121bd0a5efadd3119fa3467c595a0ca76 100644 --- a/Tables/Text/ta.ttb +++ b/Tables/Text/ta.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/tamil.tti b/Tables/Text/tamil.tti index 779c4c33db8ca3b3ea9886c710f94e1d8d7b24f0..593155832f15c9725fbf1a8da11e18683345919b 100644 --- a/Tables/Text/tamil.tti +++ b/Tables/Text/tamil.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/te.ttb b/Tables/Text/te.ttb index 98440a61f0336f9bacc9446723da80665bc57f1b..7f967949de61cdfddefbcec31931548b7e83473a 100644 --- a/Tables/Text/te.ttb +++ b/Tables/Text/te.ttb @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/telugu.tti b/Tables/Text/telugu.tti index 0dc544c9c34cbe6476208b36d4d150edd33ee042..e9d9f1ff77d8ca58a43b833a65357699ce3e97a8 100644 --- a/Tables/Text/telugu.tti +++ b/Tables/Text/telugu.tti @@ -2,7 +2,7 @@ # BRLTTY - 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-2015 by The BRLTTY Developers. +# Copyright (C) 2008-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/tr.ttb b/Tables/Text/tr.ttb index d36ad4e19046c5de055807b80cffa05c36c35011..103227edfbb6d652fb157d2f6d989d27aea22118 100644 --- a/Tables/Text/tr.ttb +++ b/Tables/Text/tr.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/vi.ttb b/Tables/Text/vi.ttb index 41b230cc0d59d7694d36000d57f47f28541b8a4c..5eb3c63b0e61ea30776f9882084b0bedfa709a83 100644 --- a/Tables/Text/vi.ttb +++ b/Tables/Text/vi.ttb @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Windows/mingw.sh b/Windows/mingw.sh index 508fff1ccfd4905176280f18824c104085937064..7f1cab2e508f250e6fac99db8861ef0d3e5045b0 100644 --- a/Windows/mingw.sh +++ b/Windows/mingw.sh @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Windows/mkwin b/Windows/mkwin index ddaf46e30420ecf7815fdc1b39158dfaab9b184d..1b02ed20a60b9fb8bf904af1292d4f4e29346af7 100755 --- a/Windows/mkwin +++ b/Windows/mkwin @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/absdeps.mk b/absdeps.mk index 3b5ccecd82b416cd2e251767f7c637a6f7a5b3f8..d1f9ad2d30835264bfa9298ce43dc6e7e2912dc5 100644 --- a/absdeps.mk +++ b/absdeps.mk @@ -687,8 +687,10 @@ $(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/ascii.h -$(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/api_types.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 +$(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/async_wait.h +$(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/api_types.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/async_io.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/brl_base.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/brl_cmds.h @@ -1901,10 +1903,13 @@ $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/alert.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/alert.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/alert.h +$(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/pid.h +$(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/program.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/prefs.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/note_types.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/tune.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/tune_types.h +$(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/tune_build.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/message.h $(BLD_TOP)Programs/alert.$O: $(SRC_TOP)Headers/brl_dots.h cd $(@D) && $(MAKE) $(@F) @@ -1950,12 +1955,12 @@ $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Programs/apitest.c $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/apitest.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/apitest.$O: $(BLD_TOP)forbuild.h -$(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/program.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/brl_cmds.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/brl_dots.h $(BLD_TOP)Programs/apitest.$O: $(SRC_TOP)Headers/cmd.h @@ -2086,6 +2091,7 @@ $(BLD_TOP)Programs/atb_compile.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Headers/atb.h $(BLD_TOP)Programs/atb_compile.$O: $(SRC_TOP)Programs/atb_internal.h @@ -2597,13 +2603,15 @@ $(BLD_TOP)Programs/brltest.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/brltest.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Programs/parameters.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/parse.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/ktb_types.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Programs/cmd_queue.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/api_types.h @@ -2624,6 +2632,9 @@ $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/lock.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/async_wait.h $(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Programs/learn.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/scr_types.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Programs/scr.h +$(BLD_TOP)Programs/brltest.$O: $(SRC_TOP)Headers/alert.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/brltty-atb.$O: @@ -2633,10 +2644,10 @@ $(BLD_TOP)Programs/brltty-atb.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/brltty-atb.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/brltty-atb.$O: $(SRC_TOP)Headers/atb.h cd $(@D) && $(MAKE) $(@F) @@ -2648,13 +2659,14 @@ $(BLD_TOP)Programs/brltty-ctb.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/brltty-ctb.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/prefs.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/log.h -$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/brltty-ctb.$O: $(SRC_TOP)Headers/lock.h @@ -2672,11 +2684,13 @@ $(BLD_TOP)Programs/brltty-ktb.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/brltty-ktb.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/dynld.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/ktb.h @@ -2706,6 +2720,7 @@ $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Programs/ses.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Programs/scr.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/message.h $(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Programs/update.h +$(BLD_TOP)Programs/brltty-ktb.$O: $(SRC_TOP)Headers/alert.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/brltty-trtxt.$O: @@ -2715,11 +2730,13 @@ $(BLD_TOP)Programs/brltty-trtxt.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/brltty-trtxt.$O: $(SRC_TOP)Headers/lock.h @@ -2737,9 +2754,11 @@ $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/strfmt.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/strfmth.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/program.h +$(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/options.h +$(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/get_sockets.h -$(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/get_select.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/brl_dots.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/charset.h @@ -2749,7 +2768,6 @@ $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/bitmask.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Programs/ttb_internal.h -$(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Programs/ttb_compile.h $(BLD_TOP)Programs/brltty-ttb.$O: $(SRC_TOP)Headers/get_curses.h $(BLD_TOP)Programs/brltty-ttb.$O: $(BLD_TOP)Programs/brlapi.h @@ -2763,12 +2781,12 @@ $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/brltty-tune.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/brltty-tune.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/log.h -$(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/program.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/prefs.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/tune_types.h $(BLD_TOP)Programs/brltty-tune.$O: $(SRC_TOP)Headers/tune_utils.h @@ -2951,6 +2969,7 @@ $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/queue.h $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/lock.h $(BLD_TOP)Programs/cmd_clipboard.$O: $(SRC_TOP)Headers/api_types.h @@ -3392,6 +3411,7 @@ $(BLD_TOP)Programs/cmd_utils.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/cmd_utils.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/cmd_utils.$O: $(SRC_TOP)Headers/strfmt.h $(BLD_TOP)Programs/cmd_utils.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/cmd_utils.$O: $(SRC_TOP)Headers/alert.h $(BLD_TOP)Programs/cmd_utils.$O: $(SRC_TOP)Headers/brl_cmds.h $(BLD_TOP)Programs/cmd_utils.$O: $(SRC_TOP)Headers/brl_dots.h $(BLD_TOP)Programs/cmd_utils.$O: $(SRC_TOP)Headers/unicode.h @@ -3463,6 +3483,7 @@ $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Programs/scr_special.h $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Headers/status_types.h $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Programs/status.h $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Programs/blink.h +$(BLD_TOP)Programs/config.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Headers/ttb.h $(BLD_TOP)Programs/config.$O: $(SRC_TOP)Headers/atb.h @@ -3536,6 +3557,7 @@ $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/async.h $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/async_wait.h $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/async_event.h $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/async_signal.h +$(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/async_alarm.h $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/alert.h $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/ctb.h $(BLD_TOP)Programs/core.$O: $(SRC_TOP)Headers/ctb_types.h @@ -3578,6 +3600,7 @@ $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/ctb.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/ctb_types.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Programs/ctb_internal.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/brl_dots.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/hostcmd.h @@ -3625,6 +3648,7 @@ $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/queue.h $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/lock.h $(BLD_TOP)Programs/datafile.$O: $(SRC_TOP)Headers/unicode.h @@ -4040,6 +4064,7 @@ $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/cmd.h $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/cmd_types.h $(BLD_TOP)Programs/ktb_compile.$O: $(SRC_TOP)Headers/strfmth.h @@ -4236,6 +4261,8 @@ $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ttb.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/atb.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ctb.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ctb_types.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ktb.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ktb_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/note_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/tune.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/tune_types.h @@ -4249,8 +4276,6 @@ $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/cmd.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/cmd_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/driver.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/gio_types.h -$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ktb.h -$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/ktb_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/queue.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/scr_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/serial_types.h @@ -4503,13 +4528,14 @@ $(BLD_TOP)Programs/options.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/options.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/params.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/log.h -$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/lock.h $(BLD_TOP)Programs/options.$O: $(SRC_TOP)Headers/parse.h @@ -4769,6 +4795,7 @@ $(BLD_TOP)Programs/prefs.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/prefs.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/prefs.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/prefs.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/prefs.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/prefs.$O: $(SRC_TOP)Headers/parse.h cd $(@D) && $(MAKE) $(@F) @@ -4805,6 +4832,7 @@ $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Programs/profile.h $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Programs/profile_types.h $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/profile.$O: $(SRC_TOP)Headers/charset.h @@ -5111,10 +5139,10 @@ $(BLD_TOP)Programs/scrtest.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/scrtest.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/scrtest.$O: $(SRC_TOP)Headers/driver.h @@ -5423,14 +5451,16 @@ $(BLD_TOP)Programs/spktest.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/spktest.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/program.h -$(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/driver.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/spk.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/spk_types.h +$(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/async.h $(BLD_TOP)Programs/spktest.$O: $(SRC_TOP)Headers/async_wait.h @@ -5606,13 +5636,15 @@ $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Programs/tbl2hex.c $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/tbl2hex.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/tbl2hex.$O: $(BLD_TOP)forbuild.h -$(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/program.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/ttb.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/bitmask.h $(BLD_TOP)Programs/tbl2hex.$O: $(SRC_TOP)Headers/dataarea.h @@ -5664,6 +5696,7 @@ $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Programs/ttb_compile.$O: $(SRC_TOP)Headers/lock.h @@ -5685,6 +5718,7 @@ $(BLD_TOP)Programs/ttb_gnome.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/ttb_gnome.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Programs/ttb_gnome.$O: $(SRC_TOP)Programs/ttb_internal.h $(BLD_TOP)Programs/ttb_gnome.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/ttb_gnome.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/ttb_gnome.$O: $(SRC_TOP)Programs/ttb_compile.h cd $(@D) && $(MAKE) $(@F) @@ -5699,6 +5733,7 @@ $(BLD_TOP)Programs/ttb_louis.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/ttb_louis.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Programs/ttb_louis.$O: $(SRC_TOP)Programs/ttb_internal.h $(BLD_TOP)Programs/ttb_louis.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/ttb_louis.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/ttb_louis.$O: $(SRC_TOP)Programs/ttb_compile.h cd $(@D) && $(MAKE) $(@F) @@ -5715,6 +5750,7 @@ $(BLD_TOP)Programs/ttb_native.$O: $(SRC_TOP)Headers/dataarea.h $(BLD_TOP)Programs/ttb_native.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Programs/ttb_native.$O: $(SRC_TOP)Programs/ttb_internal.h $(BLD_TOP)Programs/ttb_native.$O: $(SRC_TOP)Headers/datafile.h +$(BLD_TOP)Programs/ttb_native.$O: $(SRC_TOP)Headers/variables.h $(BLD_TOP)Programs/ttb_native.$O: $(SRC_TOP)Programs/ttb_compile.h cd $(@D) && $(MAKE) $(@F) @@ -5771,6 +5807,8 @@ $(BLD_TOP)Programs/tune_build.$O: $(SRC_TOP)Headers/tune.h $(BLD_TOP)Programs/tune_build.$O: $(SRC_TOP)Headers/tune_build.h $(BLD_TOP)Programs/tune_build.$O: $(SRC_TOP)Headers/tune_types.h $(BLD_TOP)Programs/tune_build.$O: $(SRC_TOP)Headers/notes.h +$(BLD_TOP)Programs/tune_build.$O: $(SRC_TOP)Headers/charset.h +$(BLD_TOP)Programs/tune_build.$O: $(SRC_TOP)Headers/lock.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/tune_utils.$O: @@ -5872,6 +5910,7 @@ $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/device.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/timing.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/async.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/async_wait.h +$(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/async_alarm.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/io_misc.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/async_io.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/io_usb.h @@ -5935,6 +5974,8 @@ $(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/usb_cdc_acm.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/usb_cdc_acm.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/strfmt.h +$(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/strfmth.h $(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/async.h $(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/async_io.h $(BLD_TOP)Programs/usb_cdc_acm.$O: $(SRC_TOP)Headers/io_usb.h @@ -6220,6 +6261,20 @@ $(BLD_TOP)Programs/usb_solaris.$O: $(SRC_TOP)Headers/queue.h $(BLD_TOP)Programs/usb_solaris.$O: $(SRC_TOP)Programs/usb_internal.h cd $(@D) && $(MAKE) $(@F) +# Dependencies for Programs/variables.$O: +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Programs/variables.c +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/prologue.h +$(BLD_TOP)Programs/variables.$O: $(BLD_TOP)config.h +$(BLD_TOP)Programs/variables.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/strfmt.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/variables.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/queue.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/charset.h +$(BLD_TOP)Programs/variables.$O: $(SRC_TOP)Headers/lock.h + cd $(@D) && $(MAKE) $(@F) + # Dependencies for Programs/xbrlapi.$O: $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Programs/xbrlapi.c $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/prologue.h @@ -6228,12 +6283,12 @@ $(BLD_TOP)Programs/xbrlapi.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/xbrlapi.$O: $(BLD_TOP)Programs/brlapi.h $(BLD_TOP)Programs/xbrlapi.$O: $(BLD_TOP)Programs/brlapi_constants.h $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Programs/brlapi_keycodes.h -$(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/datafile.h $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/options.h $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/program.h $(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/strfmth.h +$(BLD_TOP)Programs/xbrlapi.$O: $(SRC_TOP)Headers/variables.h cd $(@D) && $(MAKE) $(@F) # Generated dependencies: diff --git a/acdir/install-sh b/acdir/install-sh index b48f7fcaf962b09d9b52d3a8c09d3d0edf70e63b..e36b41638c493df0387c447ccc39dbc789a3629e 100755 --- a/acdir/install-sh +++ b/acdir/install-sh @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/autogen b/autogen index 8ddb032991a411df1491e6ca73cee3949cf0e30a..23d981bf057c7f95156fda9ba2b19039def0dae6 100755 --- a/autogen +++ b/autogen @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/bindings.mk b/bindings.mk index 99bdd67c4b2621b0899386838c72742bac70a211..21a329323bb61630632e81585442938b9902212a 100644 --- a/bindings.mk +++ b/bindings.mk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/braille.mk b/braille.mk index 4200606cbb2de6f66de5b26a44af33d7cbf6c296..91454fcb74b381a6c033c875a36c8d3d43256030 100644 --- a/braille.mk +++ b/braille.mk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/brltty.spec b/brltty.spec index 53a38bbf96125311ca02e94b72557e13d27bcb59..dcb1ed8be9be2f3d9185dc641d0098cc569ea80c 100644 --- a/brltty.spec +++ b/brltty.spec @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ ############################################################################### Name: brltty -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -45,15 +45,16 @@ BuildRequires: gcc BuildRequires: coreutils BuildRequires: binutils BuildRequires: /usr/bin/awk -BuildRequires: glibc-devel BuildRequires: tcl +BuildRequires: glibc-devel BuildRequires: libicu-devel BuildRequires: ncurses-devel +BuildRequires: alsa-lib-devel +BuildRequires: bluez-libs-devel +BuildRequires: polkit-devel +BuildRequires: systemd-devel BuildRequires: linuxdoc-tools BuildRequires: doxygen -BuildRequires: systemd-devel -BuildRequires: bluez-libs-devel -BuildRequires: alsa-lib-devel AutoProv: no Provides: brlapi-server @@ -71,7 +72,7 @@ Install this package if you use a refreshable braille display. %package -n brltty-braille-brlapi -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -89,7 +90,7 @@ of the braille device. %package -n brltty-braille-xwindow -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -115,7 +116,7 @@ application would be by a blind person using a braille device. %package -n brltty-speech-espeak -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -137,7 +138,7 @@ eSpeak text-to-speech engine. %package -n brltty-speech-festival -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -157,7 +158,7 @@ Festival text-to-speech engine. %package -n brltty-speech-flite -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -179,7 +180,7 @@ Festival Lite text-to-speech engine. %package -n brltty-speech-speechd -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -201,7 +202,7 @@ Speech Dispatcher text-to-speech server. %package -n brltty-screen-atspi -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -224,7 +225,7 @@ Technology Service Provider Interface. %package -n brltty-screen-atspi2 -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -247,7 +248,7 @@ the Assistive Technology Service Provider Interface. %package -n brltty-screen-screen -Version: 5.3.1 +Version: 5.4 Release: 1 Group: System Environment/Daemons License: GPL @@ -266,7 +267,7 @@ screen program. %package -n brltty-utils -Version: 5.3.1 +Version: 5.4 Release: 1 Group: Development/Tools License: GPL @@ -282,7 +283,7 @@ This package provides a set of commands for maintaining BRLTTY's datafiles. %package -n brltty-devel -Version: 5.3.1 +Version: 5.4 Release: 1 Group: Development/Tools License: GPL @@ -301,8 +302,24 @@ needs to interpret and/or create raw braille device packets, or which needs to interpret key codes as delivered by BrlAPI's raw mode. +%package -n brltty-systemd +Version: 5.4 +Release: 1 +Group: System Environment/Daemons +License: GPL + +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. + +Install this package if you'd like to manage BRLTTY processes via Systemd. + + %package -n brlapi -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: System Environment/Libraries License: LGPL @@ -320,7 +337,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-devel -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: Development/Libraries License: LGPL @@ -343,7 +360,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-java -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: System Environment/Libraries License: LGPL @@ -363,7 +380,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-ocaml -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: System Environment/Libraries License: LGPL @@ -384,7 +401,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-python -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: System Environment/Libraries License: LGPL @@ -406,7 +423,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-tcl -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: System Environment/Libraries License: LGPL @@ -427,7 +444,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-utils -Version: 0.6.4 +Version: 0.6.5 Release: 1 Group: Applications/System License: LGPL @@ -446,14 +463,14 @@ This package provides a set of commands for maintaining BRLTTY's datafiles. %prep # %setup -n %{name}-%{version} -%setup -n brltty-5.3.1 +%setup -n brltty-5.4 %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 +make install install-documents install-messages install-systemd 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" @@ -522,6 +539,11 @@ rm -fr "${RPM_BUILD_ROOT}" %files -n brltty-devel %{_includedir}/brltty +%files -n brltty-systemd +/usr/lib/systemd/system/brltty.* +/usr/lib/systemd/system/brltty@.* +%{_sbindir}/brltty-systemd-* + %files -n brlapi %defattr(-,root,root) %{_libdir}/libbrlapi.so.* @@ -538,8 +560,8 @@ rm -fr "${RPM_BUILD_ROOT}" /usr/lib64/python2.7/site-packages/[bB]rlapi[-.]* %files -n brlapi-tcl -/usr/lib64/tcl8.5/brlapi-0.6.4/libbrlapi_tcl.so -/usr/lib64/tcl8.5/brlapi-0.6.4/pkgIndex.tcl +/usr/lib64/tcl8.5/brlapi-0.6.5/libbrlapi_tcl.so +/usr/lib64/tcl8.5/brlapi-0.6.5/pkgIndex.tcl %files -n brlapi-devel %defattr(-,root,root) @@ -561,20 +583,45 @@ rm -fr "${RPM_BUILD_ROOT}" %changelog -* Tue Dec 22 2015 Dave Mielke 5.3.1 -Linux screen driver fix: - Some consoles couldn't be accessed due to an I/O error. -Android fix: - The preference settings can be saved. +* 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. +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. +HandyTech braille driver changes: + Model detection on Windows has been fixed. + Output errors now restart the driver. HIMS braille driver changes: - Autodetecting the braille device's model has been improved. - Keys that a model doesn't have are no longer listed within its help text. - Support for qwerty keyboards has been improved. - The scroll key bindings have been harmonized across all models. -Key table changes: - The -a (--audit) option has been added to brltty-ktb. - Duplicate key bindings have been removed. - The "uppercase" command modifier has been renamed to "upper". - The following directives have been added: - beginVariables, endVariables, ignore, listVariables + Support for the Smart Beetle has been added. + Newer firmware resolution of qwerty key code conflicts is supported. +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. +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. diff --git a/brltty.spec.in b/brltty.spec.in index 5e29b0a4b86c69d027dbf9b8c5e0374ee88ca0d3..7fd5686f35b2168fa95eb1a3714e03dba5c33085 100644 --- a/brltty.spec.in +++ b/brltty.spec.in @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -45,15 +45,16 @@ BuildRequires: gcc BuildRequires: coreutils BuildRequires: binutils BuildRequires: /usr/bin/awk -BuildRequires: glibc-devel BuildRequires: tcl +BuildRequires: glibc-devel BuildRequires: libicu-devel BuildRequires: ncurses-devel +BuildRequires: alsa-lib-devel +BuildRequires: bluez-libs-devel +BuildRequires: polkit-devel +BuildRequires: systemd-devel BuildRequires: linuxdoc-tools BuildRequires: doxygen -BuildRequires: systemd-devel -BuildRequires: bluez-libs-devel -BuildRequires: alsa-lib-devel AutoProv: no Provides: brlapi-server @@ -301,6 +302,22 @@ needs to interpret and/or create raw braille device packets, or which needs to interpret key codes as delivered by BrlAPI's raw mode. +%package -n brltty-systemd +Version: @PACKAGE_VERSION@ +Release: 1 +Group: System Environment/Daemons +License: GPL + +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. + +Install this package if you'd like to manage BRLTTY processes via Systemd. + + %package -n brlapi Version: @api_release@ Release: 1 @@ -453,7 +470,7 @@ This package provides a set of commands for maintaining BRLTTY's datafiles. make %install -make install install-documents install-messages +make install install-documents install-messages install-systemd 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" @@ -522,6 +539,11 @@ rm -fr "${RPM_BUILD_ROOT}" %files -n brltty-devel %{_includedir}/brltty +%files -n brltty-systemd +/usr/lib/systemd/system/brltty.* +/usr/lib/systemd/system/brltty@.* +%{_sbindir}/brltty-systemd-* + %files -n brlapi %defattr(-,root,root) %{_libdir}/libbrlapi.so.* @@ -561,20 +583,45 @@ rm -fr "${RPM_BUILD_ROOT}" %changelog -* Tue Dec 22 2015 Dave Mielke 5.3.1 -Linux screen driver fix: - Some consoles couldn't be accessed due to an I/O error. -Android fix: - The preference settings can be saved. +* 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. +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. +HandyTech braille driver changes: + Model detection on Windows has been fixed. + Output errors now restart the driver. HIMS braille driver changes: - Autodetecting the braille device's model has been improved. - Keys that a model doesn't have are no longer listed within its help text. - Support for qwerty keyboards has been improved. - The scroll key bindings have been harmonized across all models. -Key table changes: - The -a (--audit) option has been added to brltty-ktb. - Duplicate key bindings have been removed. - The "uppercase" command modifier has been renamed to "upper". - The following directives have been added: - beginVariables, endVariables, ignore, listVariables + Support for the Smart Beetle has been added. + Newer firmware resolution of qwerty key code conflicts is supported. +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. +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. diff --git a/cfg-android b/cfg-android index e714c380917f08d416540d3fc749dc763936ab3a..b32ce20efb78386b10edcc89b7356857f65f297b 100755 --- a/cfg-android +++ b/cfg-android @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -81,6 +81,7 @@ export LDFLAGS="-Wl,--fix-cortex-a8" "${sourceRoot}/configure" \ --disable-gpm \ --disable-icu \ + --disable-polkit \ --disable-x \ \ --without-libbraille \ diff --git a/cfg-darwin b/cfg-darwin index e341c384ed5227531d93496e36f6f5584c6d60b6..40ff2975edd8fba6a2dae0b23016cf77d5254bdb 100755 --- a/cfg-darwin +++ b/cfg-darwin @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -20,6 +20,7 @@ ./configure \ --disable-gpm \ --disable-iconv \ + --disable-polkit \ \ --without-libbraille \ \ diff --git a/cfg-dos b/cfg-dos index 6e643cf4a4c3f5b4689a670d0aa3d818dba8e44c..633aa3a5cd768b0978f714b193e25623e2a02a06 100755 --- a/cfg-dos +++ b/cfg-dos @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -49,6 +49,7 @@ export LDFLAGS="" --disable-api \ --disable-gpm \ --disable-icu \ + --disable-polkit \ --disable-x \ \ --without-libbraille \ diff --git a/cfg-grub b/cfg-grub index 24498a80e9f6ba1b578a5bdb5ee66c970e8d3765..f0c932ddc4b4340bb4032695bddc85552063520e 100755 --- a/cfg-grub +++ b/cfg-grub @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -28,6 +28,7 @@ directory=`dirname "${0}"` --disable-api \ --disable-icu \ --disable-gpm \ + --disable-polkit \ --disable-x \ \ --without-libbraille \ diff --git a/cfg-iris b/cfg-iris index 0d9f6ff9092e6b9c566b9e1f009cae256eb882fc..9a661717f7c87febc8eedebf474934ca85da7760 100755 --- a/cfg-iris +++ b/cfg-iris @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -30,6 +30,7 @@ export CC="gcc -m32" \ --disable-gpm \ --disable-icu \ + --disable-polkit \ --disable-x \ --without-curses \ \ diff --git a/chkhdrs b/chkhdrs index ad87f5856d0c38e9dbe0cc147d19c32cd2c06914..234cd40bc05ab8ea2435afdcda5b7bde629bdab8 100755 --- a/chkhdrs +++ b/chkhdrs @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/common.mk b/common.mk index 216c9379573d1ee1a840555cc2ebcb2f3a32877c..eb5b9d601bc3b4e9e50f90d4c272e5305dc85a2a 100644 --- a/common.mk +++ b/common.mk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/config.h.in b/config.h.in index 5bbe763a3514fe9b9017393d8e3492fdb2458110..d8a5c63d955e267c22ed51010c493c859194487d 100644 --- a/config.h.in +++ b/config.h.in @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2015 by The BRLTTY Developers. + * Copyright (C) 1995-2016 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -95,12 +95,21 @@ extern "C" { /* Define this if the function time exists. */ #undef HAVE_TIME +/* Define this if the function stime exists. */ +#undef HAVE_STIME + /* Define this if the function gettimeofday exists. */ #undef HAVE_GETTIMEOFDAY +/* Define this if the function settimeofday exists. */ +#undef HAVE_SETTIMEOFDAY + /* Define this if the function clock_gettime exists. */ #undef HAVE_CLOCK_GETTIME +/* Define this if the function clock_settime exists. */ +#undef HAVE_CLOCK_SETTIME + /* Define this if the function pthread_getname_np exists. */ #undef HAVE_PTHREAD_GETNAME_NP @@ -424,6 +433,9 @@ extern "C" { #undef USE_PKG_PORTS_MSDOS #undef USE_PKG_PORTS_WINDOWS +/* Define this if the Polkit authorization manager is to be used. */ +#undef USE_POLKIT + /* Define only one of the following curses packages. */ #undef HAVE_PKG_CURSES #undef HAVE_PKG_NCURSES diff --git a/config.mk.in b/config.mk.in index a6fbfb16d1f6fff77e21090b7243cd533807108a..b707bd40cfae88651ec5ca54b837d925fda864db 100644 --- a/config.mk.in +++ b/config.mk.in @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -102,6 +102,10 @@ DBUS_PACKAGE = @dbus_package@ DBUS_INCLUDES = @dbus_includes@ DBUS_LIBS = @dbus_libs@ +POLKIT_PACKAGE = @polkit_package@ +POLKIT_INCLUDES = @polkit_includes@ +POLKIT_LIBS = @polkit_libs@ + ICU_INCLUDES = @icu_includes@ ICU_LIBS = @icu_libs@ @@ -229,7 +233,7 @@ MOUNT_OBJECTS = $(MNTPT_OBJECTS) $(MNTFS_OBJECTS) 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 timing.$O $(ASYNC_OBJECTS) queue.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS) datafile.$O unicode.$O lock.$O $(CHARSET_OBJECTS) +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) @@ -244,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDLIBS = $(ICU_LIBS) $(SYSTEM_LIBS) @LIBS@ +LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@ MKOBJ = @MKOBJ@ MKMOD = @MKMOD@ diff --git a/config.sh.in b/config.sh.in index 7310d2a52d6aff7a865c0502d9dcab8b8218d520..249667c911df50c87a1927619faa39015d03c715 100644 --- a/config.sh.in +++ b/config.sh.in @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/configure b/configure index bafaf211c968744c10972e9779878d88b04f715c..1f4f56711558be639ac2baa32abfbf670d457641 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for BRLTTY 5.3.1. +# Generated by GNU Autoconf 2.69 for BRLTTY 5.4. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='BRLTTY' PACKAGE_TARNAME='brltty' -PACKAGE_VERSION='5.3.1' -PACKAGE_STRING='BRLTTY 5.3.1' +PACKAGE_VERSION='5.4' +PACKAGE_STRING='BRLTTY 5.4' PACKAGE_BUGREPORT='brltty@mielke.cc' PACKAGE_URL='http://brltty.com/' @@ -808,6 +808,8 @@ dynld_package params_libs params_includes params_package +SYSTEMD_SERVICE_ARGUMENTS +SYSTEMD_SERVICE_TYPE service_libs service_includes service_package @@ -905,6 +907,9 @@ JAVADOC JAVADOC_NAME JAVAC JAVAC_PATH +polkit_libs +polkit_includes +polkit_package icu_libs icu_includes icu_package @@ -1046,6 +1051,7 @@ enable_standalone_programs enable_i18n enable_icu enable_iconv +enable_polkit enable_api with_api_parameters with_api_socket_path @@ -1656,7 +1662,7 @@ if test "$ac_init_help" = "long"; then # 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.3.1 to adapt to many kinds of systems. +\`configure' configures BRLTTY 5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1722,7 +1728,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of BRLTTY 5.3.1:";; + short | recursive ) echo "Configuration of BRLTTY 5.4:";; esac cat <<\_ACEOF @@ -1734,6 +1740,7 @@ Optional Features: --disable-i18n support for internationalization --disable-icu support for Unicode-based internationalization --disable-iconv support for character encoding conversion + --disable-polkit support for the Polkit authorization manager --disable-api the application programming interface --disable-java-bindings Java bindings for BrlAPI --disable-lisp-bindings Lisp bindings for BrlAPI @@ -2080,7 +2087,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -BRLTTY configure 5.3.1 +BRLTTY configure 5.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2799,7 +2806,7 @@ cat >config.log <<_ACEOF 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.3.1, which was +It was created by BRLTTY $as_me 5.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3153,7 +3160,7 @@ api_major=0 api_minor=6 -api_revision=4 +api_revision=5 api_version=${api_major}.${api_minor} @@ -3188,6 +3195,13 @@ brltty_build_directories=". Programs Documents Messages Android/Core Android/App brltty_source_directory="`dirname "${0}"`" brltty_manual_directories="" +for brltty_autostart_directory in `(cd "${brltty_source_directory}" && echo Autostart/*)` +do + test -f "${brltty_source_directory}/${brltty_autostart_directory}/Makefile.in" && { + brltty_build_directories="${brltty_build_directories} ${brltty_autostart_directory}" + } +done + for brltty_manual_directory in `(cd "${brltty_source_directory}" && echo Documents/Manual-*/*)` do test -f "${brltty_source_directory}/${brltty_manual_directory}/Makefile.in" && { @@ -7041,6 +7055,58 @@ done fi fi +# Check whether --enable-polkit was given. +if test "${enable_polkit+set}" = set; then : + enableval=$enable_polkit; +else + enableval="yes" +fi + + +brltty_enabled_polkit="${enableval}" +brltty_summary_lines="${brltty_summary_lines} + polkit: ${brltty_enabled_polkit}" + +if test "${enableval}" = "no" +then + : +else + if test "${enableval}" = "yes" + then + brltty_ok=true + else + brltty_ok=false + fi + + if "${brltty_ok}" + then + polkit_package="" +polkit_includes="" +polkit_libs="" + +for package_specification in polkit-gobject-1 +do + ${PKG_CONFIG} --exists "${package_specification}" && { + polkit_package="${package_specification%% *}" + polkit_includes=`${PKG_CONFIG} --cflags-only-I "${polkit_package}"` + polkit_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${polkit_package}"` + +$as_echo "#define USE_POLKIT 1" >>confdefs.h + + break + } +done + + + + + + + else + as_fn_error $? "invalid selection: --enable-polkit=${enableval}" "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthreads are available" >&5 $as_echo_n "checking if pthreads are available... " >&6; } if ${brltty_cv_have_pthreads+:} false; then : @@ -7357,7 +7423,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by +# Copyright (C) 2006-2016 by # Samuel Thibault # Sébastien Hinderer # @@ -7897,7 +7963,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -8395,7 +8461,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2015 by +# Copyright (C) 2005-2016 by # Alexis Robert # Samuel Thibault # @@ -8662,7 +8728,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2015 by Dave Mielke +# Copyright (C) 2006-2016 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -9427,7 +9493,7 @@ test -z "$gui_toolkit_package" && { esac } -for ac_func in time gettimeofday nanosleep +for ac_func in time stime gettimeofday settimeofday nanosleep do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -9439,7 +9505,6 @@ _ACEOF fi done - ac_fn_c_check_decl "$LINENO" "clock_gettime" "ac_cv_have_decl_clock_gettime" " #include @@ -9511,6 +9576,78 @@ fi fi + ac_fn_c_check_decl "$LINENO" "clock_settime" "ac_cv_have_decl_clock_settime" " +#include + +" +if test "x$ac_cv_have_decl_clock_settime" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_settime" >&5 +$as_echo_n "checking for library containing clock_settime... " >&6; } +if ${ac_cv_search_clock_settime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_settime (); +int +main () +{ +return clock_settime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_settime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_clock_settime+:} false; then : + break +fi +done +if ${ac_cv_search_clock_settime+:} false; then : + +else + ac_cv_search_clock_settime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_settime" >&5 +$as_echo "$ac_cv_search_clock_settime" >&6; } +ac_res=$ac_cv_search_clock_settime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + brltty_define=`echo "have_clock_settime" | sed -e 'y%abcdefghijklmnopqrstuvwxyz%ABCDEFGHIJKLMNOPQRSTUVWXYZ%'` + +cat >>confdefs.h <<_ACEOF +#define ${brltty_define} 1 +_ACEOF + + +fi + + +fi + + + ac_fn_c_check_decl "$LINENO" "pthread_getname_np" "ac_cv_have_decl_pthread_getname_np" " #include @@ -11245,6 +11382,19 @@ _ACEOF brltty_summary_lines="${brltty_summary_lines} service-package: ${service_package}" +SYSTEMD_SERVICE_TYPE="forking" + +SYSTEMD_SERVICE_ARGUMENTS="" + + +case "${service_package}" +in + libsystemd) + SYSTEMD_SERVICE_TYPE="notify" + SYSTEMD_SERVICE_ARGUMENTS="-n" + ;; +esac + params_package="" params_includes="" params_libs="" @@ -15487,7 +15637,7 @@ brltty_make_files="`echo "${brltty_build_directories}" | sed -e ' s%\([^ ][^ ]*\)%\1/Makefile:prologue.mk:\1/Makefile.in%g '`" -ac_config_files="$ac_config_files config.mk brltty.spec config.sh Documents/brltty.conf Documents/brltty.1 Documents/BrlAPIref.doxy Bindings/Lisp/brlapi.lisp Bindings/Python/setup.py Android/Application/res/values/configured.xml:Android/Application/res.strings.in Autostart/Systemd/brltty.service ${brltty_make_files}" +ac_config_files="$ac_config_files config.mk brltty.spec config.sh Documents/brltty.conf Documents/brltty.1 Documents/BrlAPIref.doxy Bindings/Lisp/brlapi.lisp Bindings/Python/setup.py Android/Application/res/values/configured.xml:Android/Application/res.strings.in Autostart/Systemd/brltty@.service ${brltty_make_files}" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15996,7 +16146,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.3.1, which was +This file was extended by BRLTTY $as_me 5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16063,7 +16213,7 @@ _ACEOF 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.3.1 +BRLTTY config.status 5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16205,7 +16355,7 @@ do "Bindings/Lisp/brlapi.lisp") CONFIG_FILES="$CONFIG_FILES Bindings/Lisp/brlapi.lisp" ;; "Bindings/Python/setup.py") CONFIG_FILES="$CONFIG_FILES Bindings/Python/setup.py" ;; "Android/Application/res/values/configured.xml") CONFIG_FILES="$CONFIG_FILES Android/Application/res/values/configured.xml:Android/Application/res.strings.in" ;; - "Autostart/Systemd/brltty.service") CONFIG_FILES="$CONFIG_FILES Autostart/Systemd/brltty.service" ;; + "Autostart/Systemd/brltty@.service") CONFIG_FILES="$CONFIG_FILES Autostart/Systemd/brltty@.service" ;; "${brltty_make_files}") CONFIG_FILES="$CONFIG_FILES ${brltty_make_files}" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index be6c5d6bcf6eb9bd41480bfbff73e13cc5e3c494..a4adc4ee4c22d09551e3963cce285c825b6f086f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf 2.53 to produce a configure script. # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,12 +18,12 @@ dnl Process this file with autoconf 2.53 to produce a configure script. ############################################################################### AC_PREREQ([2.64]) -AC_INIT([BRLTTY], [5.3.1], [brltty@mielke.cc], [brltty], [http://brltty.com/]) +AC_INIT([BRLTTY], [5.4], [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], [4]) +AC_SUBST([api_revision], [5]) AC_SUBST([api_version], [${api_major}.${api_minor}]) AC_SUBST([api_release], [${api_version}.${api_revision}]) @@ -42,6 +42,13 @@ brltty_build_directories=". Programs Documents Messages Android/Core Android/App brltty_source_directory="`dirname "${0}"`" brltty_manual_directories="" +for brltty_autostart_directory in `(cd "${brltty_source_directory}" && echo Autostart/*)` +do + test -f "${brltty_source_directory}/${brltty_autostart_directory}/Makefile.in" && { + brltty_build_directories="${brltty_build_directories} ${brltty_autostart_directory}" + } +done + for brltty_manual_directory in `(cd "${brltty_source_directory}" && echo Documents/Manual-*/*)` do test -f "${brltty_source_directory}/${brltty_manual_directory}/Makefile.in" && { @@ -623,6 +630,15 @@ BRLTTY_ARG_DISABLE( ]) ]) +BRLTTY_ARG_DISABLE( + [polkit], + [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_ARG_DISABLE( [api], [the application programming interface], @@ -774,9 +790,10 @@ test -z "$gui_toolkit_package" && { esac } -AC_CHECK_FUNCS([time gettimeofday nanosleep]) - +AC_CHECK_FUNCS([time stime gettimeofday settimeofday nanosleep]) BRLTTY_CHECK_FUNCTION([clock_gettime], [time.h], [rt]) +BRLTTY_CHECK_FUNCTION([clock_settime], [time.h], [rt]) + BRLTTY_CHECK_FUNCTION([pthread_getname_np], [pthread.h], [pthread]) AC_CHECK_DECLS([localtime_r], [], [], [dnl @@ -1116,6 +1133,17 @@ BRLTTY_ARG_PACKAGE([service], [system service], [libsystemd], [dnl ;; ]) +AC_SUBST([SYSTEMD_SERVICE_TYPE], ["forking"]) +AC_SUBST([SYSTEMD_SERVICE_ARGUMENTS], [""]) + +case "${service_package}" +in + libsystemd) + SYSTEMD_SERVICE_TYPE="notify" + SYSTEMD_SERVICE_ARGUMENTS="-n" + ;; +esac + BRLTTY_ARG_PACKAGE([params], [boot parameters], [], [dnl linux*) params_package="linux" @@ -1857,6 +1885,6 @@ AC_OUTPUT([ Bindings/Lisp/brlapi.lisp Bindings/Python/setup.py Android/Application/res/values/configured.xml:Android/Application/res.strings.in - Autostart/Systemd/brltty.service + Autostart/Systemd/brltty@.service ${brltty_make_files} ]) diff --git a/document.mk b/document.mk index 77526781837ffafed07b0694c0ebb3780972cded..3d2e81e721597bde54f02f130fced021e664f437 100644 --- a/document.mk +++ b/document.mk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/gendeps b/gendeps index e8933a4fca1edcd63142966657a3b7bc8621f806..0b7a616e0bbb5010938b10c7eb7666fd09fc0011 100755 --- a/gendeps +++ b/gendeps @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/getrevid b/getrevid index 6e5a933d9d66f75a8c6ef73d43f77680bfb6dee1..59a26e05c84a71735cf92f3e26731d23dcda67ca 100755 --- a/getrevid +++ b/getrevid @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mk4build b/mk4build index 5032c10d88a6f0e197ca555cb981777f20aa5d2e..0c47828b7eb89840633fa50f20a5152809b803af 100755 --- a/mk4build +++ b/mk4build @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mkdocktb b/mkdocktb index 101c3d620173892585b2ea525f76b42ba11ac4dc..f3cd2ec5bf47dda024ee6c5b07156397b3b2de05 100755 --- a/mkdocktb +++ b/mkdocktb @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mkdocs b/mkdocs index fb0d8be0cff6be8cc81709b76dfbd26a2fd4e421..c73368046ef36e3e4a635aade58415e55086ad96 100755 --- a/mkdocs +++ b/mkdocs @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mkpot b/mkpot index 927242703801e6b04881574ecbb23be8ac5190d4..8f20b28442c6f042bc000e0bf8631e92696655ee 100755 --- a/mkpot +++ b/mkpot @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mkrpm b/mkrpm index 80d97fc4796e07585ee90cbc75665cad368a093f..78937383b5d98982693d192308dc8fbf277c811a 100755 --- a/mkrpm +++ b/mkrpm @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mktar b/mktar index 988cf6850a61314cc0d944d8d52450aaf3c0989f..29b6f65858d33566ec85bbd8de9d3724477a268c 100755 --- a/mktar +++ b/mktar @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/mkzip b/mkzip index 0ea989df7e002de62c9f0cfc806e1f1cad574bed..b4397b903de41667b7d01f76f49ee16cfb334e8b 100755 --- a/mkzip +++ b/mkzip @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/prologue.mk b/prologue.mk index bb8af320fb77d43b83d68529a94b82600ef05d7c..9da97e9176b3d181a553abe16e44b787230d243b 100644 --- a/prologue.mk +++ b/prologue.mk @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/prologue.sh b/prologue.sh index 8af5f8fff095adbaec8f9ea56d5712dc44f40dca..ac8adda02346040b314e8747faf8739d2d338fac 100644 --- a/prologue.sh +++ b/prologue.sh @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/prologue.tcl b/prologue.tcl index 85fb9a88e7edc781cda24aa6b66b8de4891d8389..db1bba43d7f5a44d04b9234f48f2b5cbecf7f2ad 100644 --- a/prologue.tcl +++ b/prologue.tcl @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/rpm.log b/rpm.log new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/run-brltty b/run-brltty index 895faa19ffe8382ff1f39a5a9f8634813a796e48..001ab6aeaec50842293a10c1fa8ec5dc6381de10 100755 --- a/run-brltty +++ b/run-brltty @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -23,5 +23,5 @@ BRLTTY_DRIVERS_DIRECTORY="${programDirectory}/lib" BRLTTY_TABLES_DIRECTORY="${programDirectory}/Tables" export BRLTTY_DRIVERS_DIRECTORY BRLTTY_TABLES_DIRECTORY -exec "${programDirectory}/run-command" "${programDirectory}/Programs/brltty" -E "$@" +exec "${programDirectory}/run-command" "${programDirectory}/Programs/brltty" -E "${@}" exit "${?}" diff --git a/run-command b/run-command index d5dce7c7f81c474d03537244e4b4a3be74a4028d..51b49fd8abc906f4eb3594c43e67ca2163123047 100755 --- a/run-command +++ b/run-command @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -23,5 +23,23 @@ LD_LIBRARY_PATH="${programDirectory}/Programs${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH -exec "${@}" +vgFile="" +vgDirectory="${BRLTTY_VALGRIND}" + +[ -z "${vgDirectory}" ] || { + [ ! -d "${vgDirectory}" ] || { + [ ! -w "${vgDirectory}" ] || { + vgFile="${vgDirectory}/$(basename "${1}")-$(date +%Y%m%d-%H%M%S).vg" + } + } +} + +if [ -n "${vgFile}" ] +then + set -- valgrind --log-file="${vgFile}" --leak-check=full --show-reachable=yes "${@}" +else + set -- exec "${@}" +fi + +"${@}" exit "${?}" diff --git a/run-xbrlapi b/run-xbrlapi index 2e5e227138b70ac725a8fef942beab2d603dcd3d..87fbdaeec63afc292ace5f404d8d4c252127168f 100755 --- a/run-xbrlapi +++ b/run-xbrlapi @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/screen.mk b/screen.mk index 5a4ec982cb1af8cd9fd7b23451e979b0eb4ee378..e70826e7fc656604ee31947ba97e6c2652246b9d 100644 --- a/screen.mk +++ b/screen.mk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/speech.mk b/speech.mk index e09811ad0d715e22f3f6263228e593c232391f81..bb3028e902eb5fa7e5de6e2359656d34ebd4046b 100644 --- a/speech.mk +++ b/speech.mk @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/updusbdevs b/updusbdevs index ff3694a02d0f225ee26d9e093f4902ea935c522a..8b89ba51b91072b4113ae90108666ec237bae21f 100755 --- a/updusbdevs +++ b/updusbdevs @@ -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-2015 by The BRLTTY Developers. +# Copyright (C) 1995-2016 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -366,7 +366,7 @@ proc makeLines_udev {vendor product drivers descriptions exclude} { lappend lines [makeComment_udev $description] } - set line [format "ENV\{PRODUCT\}==\"%x/%x/*\", ENV\{BRLTTY_BRAILLE_DRIVER\}=\"auto\", GOTO=\"brltty_usb_run\"" $vendor $product] + set line [format "ENV\{PRODUCT\}==\"%x/%x/*\", ENV\{BRLTTY_BRAILLE_DRIVER\}=\"%s\", GOTO=\"brltty_usb_run\"" $vendor $product [join $drivers ,]] if {$exclude} { set line [makeComment_udev $line] }