Commit 46c840f866491de52016683efd8717b33b9a9f5e

Authored by Mario Lang
1 parent ddb67033

Imported Upstream version 5.4

Showing 1227 changed files with 5632 additions and 3505 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 1227 files displayed.

Android/Application/AndroidManifest.xml
... ... @@ -3,7 +3,7 @@
3 3 <manifest
4 4 xmlns:android="http://schemas.android.com/apk/res/android"
5 5 package="org.a11y.brltty.android"
6   - android:versionCode="4"
  6 + android:versionCode="5"
7 7 android:versionName="@string/app_version"
8 8 >
9 9  
... ...
Android/Application/mksettings
... ... @@ -3,7 +3,7 @@
3 3 # BRLTTY - A background process providing access to the console screen (when in
4 4 # text mode) for a blind person using a refreshable braille display.
5 5 #
6   -# Copyright (C) 1995-2015 by The BRLTTY Developers.
  6 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
7 7 #
8 8 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
9 9 #
... ...
Android/Application/newstrings
... ... @@ -3,7 +3,7 @@
3 3 # BRLTTY - A background process providing access to the console screen (when in
4 4 # text mode) for a blind person using a refreshable braille display.
5 5 #
6   -# Copyright (C) 1995-2015 by The BRLTTY Developers.
  6 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
7 7 #
8 8 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
9 9 #
... ...
Android/Application/res/xml/usb_devices.xml
... ... @@ -272,9 +272,13 @@
272 272 <usb-device vendor-id="7281" product-id="49156" />
273 273  
274 274 <!-- Device: 1C71:C005 -->
275   - <!-- HumanWare [all models] -->
  275 + <!-- HumanWare [all models (serial protocol)] -->
276 276 <usb-device vendor-id="7281" product-id="49157" />
277 277  
  278 + <!-- Device: 1C71:C006 -->
  279 + <!-- HumanWare [all models (HID protocol)] -->
  280 + <usb-device vendor-id="7281" product-id="49158" />
  281 +
278 282 <!-- Device: 1FE4:0003 -->
279 283 <!-- HandyTech [USB-HID adapter] -->
280 284 <usb-device vendor-id="8164" product-id="3" />
... ...
Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2012 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2012 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2012 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/BrailleService.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2012 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/CoreThread.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/InputService.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/LockUtilities.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/PcmDevice.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/RealScreenElement.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/RenderedScreen.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenDriver.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenElement.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenElementList.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenLogger.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/ScreenWindow.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/SettingsActivity.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/SingletonReference.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/SpeechDriver.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/StringMaker.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/UsbHelper.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Core/Makefile
... ... @@ -3,7 +3,7 @@
3 3 # BRLTTY - A background process providing access to the console screen (when in
4 4 # text mode) for a blind person using a refreshable braille display.
5 5 #
6   -# Copyright (C) 1995-2015 by The BRLTTY Developers.
  6 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
7 7 #
8 8 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
9 9 #
... ...
Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2013 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Core/src/org/a11y/brltty/core/CoreWrapper.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2013 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Core/src/org/a11y/brltty/core/LogLevel.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2013 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java
... ... @@ -2,7 +2,7 @@
2 2 * BRLTTY - A background process providing access to the console screen (when in
3 3 * text mode) for a blind person using a refreshable braille display.
4 4 *
5   - * Copyright (C) 1995-2013 by The BRLTTY Developers.
  5 + * Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 *
7 7 * BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 *
... ...
Authorization/Polkit/org.brltty.policy 0 → 100644
... ... @@ -0,0 +1,22 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +
  3 +<!DOCTYPE policyconfig PUBLIC
  4 + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  5 + "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"
  6 +>
  7 +
  8 +<policyconfig>
  9 + <vendor>The BRLTTY Developers</vendor>
  10 + <vendor_url>http://www.brltty.com/</vendor_url>
  11 +
  12 + <action id="org.brltty.write-display">
  13 + <description>Write to the braille display</description>
  14 + <message>Privileges are required to access the braille display</message>
  15 +
  16 + <defaults>
  17 + <allow_any>no</allow_any>
  18 + <allow_inactive>no</allow_inactive>
  19 + <allow_active>yes</allow_active>
  20 + </defaults>
  21 + </action>
  22 +</policyconfig>
... ...
Autostart/Hotplug/brltty
... ... @@ -3,7 +3,7 @@
3 3 # BRLTTY - A background process providing access to the console screen (when in
4 4 # text mode) for a blind person using a refreshable braille display.
5 5 #
6   -# Copyright (C) 1995-2015 by The BRLTTY Developers.
  6 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
7 7 #
8 8 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
9 9 #
... ...
Autostart/Hotplug/brltty.usermap
... ... @@ -2,7 +2,7 @@
2 2 # BRLTTY - A background process providing access to the console screen (when in
3 3 # text mode) for a blind person using a refreshable braille display.
4 4 #
5   -# Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 #
7 7 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 #
... ... @@ -287,9 +287,13 @@ brltty 0x0003 0x1148 0x0301
287 287 brltty 0x0003 0x1c71 0xc004
288 288  
289 289 # Device: 1C71:C005
290   -# HumanWare [all models]
  290 +# HumanWare [all models (serial protocol)]
291 291 brltty 0x0003 0x1c71 0xc005
292 292  
  293 +# Device: 1C71:C006
  294 +# HumanWare [all models (HID protocol)]
  295 +brltty 0x0003 0x1c71 0xc006
  296 +
293 297 # Device: 1FE4:0003
294 298 # HandyTech [USB-HID adapter]
295 299 brltty 0x0003 0x1fe4 0x0003
... ...
Autostart/Systemd/Makefile.in 0 → 100644
... ... @@ -0,0 +1,41 @@
  1 +###############################################################################
  2 +# BRLTTY - A background process providing access to the console screen (when in
  3 +# text mode) for a blind person using a refreshable braille display.
  4 +#
  5 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
  6 +#
  7 +# BRLTTY comes with ABSOLUTELY NO WARRANTY.
  8 +#
  9 +# This is free software, placed under the terms of the
  10 +# GNU General Public License, as published by the Free Software
  11 +# Foundation; either version 2 of the License, or (at your option) any
  12 +# later version. Please see the file LICENSE-GPL for details.
  13 +#
  14 +# Web Page: http://brltty.com/
  15 +#
  16 +# This software is maintained by Dave Mielke <dave@mielke.cc>.
  17 +###############################################################################
  18 +
  19 +SYSTEMD_UNIT_DIRECTORY = $(INSTALL_ROOT)/usr/lib/systemd/system
  20 +SYSTEMD_SCRIPT_DIRECTORY = $(INSTALL_ROOT)$(sbindir)
  21 +
  22 +install: install-units install-scripts
  23 +
  24 +install-unit-directory:
  25 + $(INSTALL_DIRECTORY) $(SYSTEMD_UNIT_DIRECTORY)
  26 +
  27 +install-units: install-unit-directory
  28 + $(INSTALL_DATA) $(SRC_DIR)/brltty.service $(SYSTEMD_UNIT_DIRECTORY)
  29 + $(INSTALL_DATA) $(BLD_DIR)/brltty@.service $(SYSTEMD_UNIT_DIRECTORY)
  30 +
  31 +install-script-directory:
  32 + $(INSTALL_DIRECTORY) $(SYSTEMD_SCRIPT_DIRECTORY)
  33 +
  34 +install-scripts: install-script-directory
  35 + $(INSTALL_SCRIPT) $(SRC_DIR)/brltty-systemd-wrapper $(SYSTEMD_SCRIPT_DIRECTORY)
  36 +
  37 +uninstall:
  38 + -rm -f $(SYSTEMD_UNIT_DIRECTORY)/brltty.*
  39 + -rm -f $(SYSTEMD_UNIT_DIRECTORY)/brltty@.*
  40 + -rm -f $(SYSTEMD_SCRIPT_DIRECTORY)/brltty-systemd-*
  41 +
... ...
Autostart/Systemd/brltty-old.service
... ... @@ -1,34 +0,0 @@
1   -[Unit]
2   -
3   -Description=Braille Device Support
4   -Documentation=man:brltty(1)
5   -Documentation=http://mielke.cc/brltty/
6   -
7   -DefaultDependencies=no
8   -Before=sysinit.target
9   -
10   -
11   -[Service]
12   -
13   -Type=forking
14   -PIDFile=/run/brltty.pid
15   -ExecStart=/bin/brltty -P /run/brltty.pid
16   -
17   -TimeoutStartSec=5
18   -TimeoutStopSec=10
19   -
20   -Restart=always
21   -RestartSec=30
22   -
23   -Nice=-10
24   -OOMScoreAdjust=-900
25   -
26   -ProtectHome=read-only
27   -ProtectSystem=full
28   -SystemCallArchitectures=native
29   -
30   -
31   -[Install]
32   -WantedBy=sysinit.target
33   -
34   -
Autostart/Systemd/brltty-systemd-wrapper 0 → 100755
... ... @@ -0,0 +1,80 @@
  1 +#!/bin/bash -p
  2 +###############################################################################
  3 +# BRLTTY - A background process providing access to the console screen (when in
  4 +# text mode) for a blind person using a refreshable braille display.
  5 +#
  6 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
  7 +#
  8 +# BRLTTY comes with ABSOLUTELY NO WARRANTY.
  9 +#
  10 +# This is free software, placed under the terms of the
  11 +# GNU General Public License, as published by the Free Software
  12 +# Foundation; either version 2 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-GPL for details.
  14 +#
  15 +# Web Page: http://brltty.com/
  16 +#
  17 +# This software is maintained by Dave Mielke <dave@mielke.cc>.
  18 +###############################################################################
  19 +
  20 +set -e
  21 +readonly defaultInstance="/etc/brltty.conf"
  22 +readonly programName="${0##*/}"
  23 +
  24 +programMessage() {
  25 + local message="${1}"
  26 +
  27 + echo >&2 "${programName}: ${message}"
  28 +}
  29 +
  30 +syntaxError() {
  31 + local message="${1}"
  32 +
  33 + programMessage "${message}"
  34 + exit 2
  35 +}
  36 +
  37 +semanticError() {
  38 + local message="${1}"
  39 +
  40 + programMessage "${message}"
  41 + exit 3
  42 +}
  43 +
  44 +readonly currentInstance="${BRLTTY_SYSTEMD_INSTANCE:-${defaultInstance}}"
  45 +[ -e "${currentInstance}" ] || semanticError "instance not found: ${currentInstance}"
  46 +[ -r "${currentInstance}" ] || semanticError "instance not readable: ${currentInstance}"
  47 +
  48 +if [ -c "${currentInstance}" ]
  49 +then
  50 + udevMaintained=false
  51 +
  52 + while read line
  53 + do
  54 + if [[ "${line}" =~ ^'N: ' ]]
  55 + then
  56 + udevMaintained=true
  57 + elif [[ "${line}" =~ ^'E: '([^ =]+)=(.*) ]]
  58 + then
  59 + name="${BASH_REMATCH[1]}"
  60 + value="${BASH_REMATCH[2]}"
  61 +
  62 + [[ "${name}" =~ ^'BRLTTY_' ]] || continue
  63 + [ -z "${!name}" ] || continue
  64 +
  65 + export "${name}=${value}"
  66 + fi
  67 + done < <((udevadm info --name="${currentInstance}" --export 2>/dev/null))
  68 +
  69 + "${udevMaintained}" || semanticError "instance not maintained by udev: ${currentInstance}"
  70 +elif [ -f "${currentInstance}" ]
  71 +then
  72 + export BRLTTY_CONFIGURATION_FILE="${currentInstance}"
  73 +else
  74 + semanticError "unrecognized instance type: ${currentInstance}"
  75 +fi
  76 +
  77 +set -- "${BRLTTY_EXECUTABLE_PATH:-brltty}" -E ${BRLTTY_EXECUTABLE_ARGUMENTS} "${@}"
  78 +programMessage "starting executable: ${*}"
  79 +exec "${@}"
  80 +exit "${?}"
... ...
Autostart/Systemd/brltty.service 0 → 100644
... ... @@ -0,0 +1,22 @@
  1 +[Unit]
  2 +
  3 +Description=Default BRLTTY Instance
  4 +Documentation=man:brltty(1)
  5 +Documentation=http://brltty.com/
  6 +
  7 +DefaultDependencies=no
  8 +Before=sysinit.target
  9 +Requires=brltty@-etc-brltty.conf.service
  10 +
  11 +
  12 +[Service]
  13 +
  14 +Type=oneshot
  15 +RemainAfterExit=true
  16 +ExecStart=/bin/true
  17 +
  18 +
  19 +[Install]
  20 +WantedBy=sysinit.target
  21 +
  22 +
... ...
Autostart/Systemd/brltty.service.in
... ... @@ -1,35 +0,0 @@
1   -[Unit]
2   -
3   -Description=Braille Device Support
4   -Documentation=man:brltty(1)
5   -Documentation=http://brltty.com/
6   -
7   -DefaultDependencies=no
8   -Before=sysinit.target
9   -
10   -RequiresMountsFor=@UPDATABLE_DIRECTORY@
11   -
12   -
13   -[Service]
14   -
15   -Type=notify
16   -ExecStart=/bin/brltty --no-daemon
17   -
18   -TimeoutStartSec=5
19   -TimeoutStopSec=10
20   -
21   -Restart=always
22   -RestartSec=30
23   -
24   -Nice=-10
25   -OOMScoreAdjust=-900
26   -
27   -ProtectHome=read-only
28   -ProtectSystem=full
29   -SystemCallArchitectures=native
30   -
31   -
32   -[Install]
33   -WantedBy=sysinit.target
34   -
35   -
Autostart/Systemd/brltty@.service.in 0 → 100644
... ... @@ -0,0 +1,36 @@
  1 +[Unit]
  2 +
  3 +Description=BRLTTY Instance: %I
  4 +Documentation=man:brltty(1)
  5 +Documentation=@PACKAGE_URL@
  6 +
  7 +DefaultDependencies=no
  8 +StopWhenUnneeded=true
  9 +
  10 +RequiresMountsFor=@UPDATABLE_DIRECTORY@
  11 +
  12 +
  13 +[Service]
  14 +
  15 +Environment="BRLTTY_SYSTEMD_INSTANCE=%I"
  16 +ExecStart=/sbin/brltty-systemd-wrapper
  17 +
  18 +Type=@SYSTEMD_SERVICE_TYPE@
  19 +Environment="BRLTTY_EXECUTABLE_ARGUMENTS=@SYSTEMD_SERVICE_ARGUMENTS@"
  20 +
  21 +PIDFile=%t/brltty-%i.pid
  22 +Environment=BRLTTY_PID_FILE=%t/brltty-%i.pid
  23 +
  24 +TimeoutStartSec=5
  25 +TimeoutStopSec=10
  26 +
  27 +Restart=always
  28 +RestartSec=30
  29 +
  30 +Nice=-10
  31 +OOMScoreAdjust=-900
  32 +
  33 +ProtectHome=read-only
  34 +ProtectSystem=full
  35 +
  36 +
... ...
Autostart/Systemd/reldeps.mk 0 → 100644
Autostart/Udev/udev.rules
... ... @@ -2,7 +2,7 @@
2 2 # BRLTTY - A background process providing access to the console screen (when in
3 3 # text mode) for a blind person using a refreshable braille display.
4 4 #
5   -# Copyright (C) 1995-2015 by The BRLTTY Developers.
  5 +# Copyright (C) 1995-2016 by The BRLTTY Developers.
6 6 #
7 7 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 #
... ... @@ -35,241 +35,241 @@ LABEL=&quot;brltty_usb_begin&quot;
35 35 # HIMS [Sync Braille]
36 36 # HandyTech [FTDI chip]
37 37 # MDV [all models]
38   -ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  38 +ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="at,ce,hm,ht,md", GOTO="brltty_usb_run"
39 39  
40 40 # Device: 0403:DE58
41 41 # Hedo [MobilLine]
42   -ENV{PRODUCT}=="403/de58/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  42 +ENV{PRODUCT}=="403/de58/*", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run"
43 43  
44 44 # Device: 0403:DE59
45 45 # Hedo [ProfiLine]
46   -ENV{PRODUCT}=="403/de59/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  46 +ENV{PRODUCT}=="403/de59/*", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run"
47 47  
48 48 # Device: 0403:F208
49 49 # Papenmeier [all models]
50   -ENV{PRODUCT}=="403/f208/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  50 +ENV{PRODUCT}=="403/f208/*", ENV{BRLTTY_BRAILLE_DRIVER}="pm", GOTO="brltty_usb_run"
51 51  
52 52 # Device: 0403:FE70
53 53 # Baum [Vario 40 (40 cells)]
54   -ENV{PRODUCT}=="403/fe70/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  54 +ENV{PRODUCT}=="403/fe70/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
55 55  
56 56 # Device: 0403:FE71
57 57 # Baum [PocketVario (24 cells)]
58   -ENV{PRODUCT}=="403/fe71/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  58 +ENV{PRODUCT}=="403/fe71/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
59 59  
60 60 # Device: 0403:FE72
61 61 # Baum [SuperVario 40 (40 cells)]
62   -ENV{PRODUCT}=="403/fe72/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  62 +ENV{PRODUCT}=="403/fe72/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
63 63  
64 64 # Device: 0403:FE73
65 65 # Baum [SuperVario 32 (32 cells)]
66   -ENV{PRODUCT}=="403/fe73/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  66 +ENV{PRODUCT}=="403/fe73/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
67 67  
68 68 # Device: 0403:FE74
69 69 # Baum [SuperVario 64 (64 cells)]
70   -ENV{PRODUCT}=="403/fe74/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  70 +ENV{PRODUCT}=="403/fe74/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
71 71  
72 72 # Device: 0403:FE75
73 73 # Baum [SuperVario 80 (80 cells)]
74   -ENV{PRODUCT}=="403/fe75/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  74 +ENV{PRODUCT}=="403/fe75/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
75 75  
76 76 # Device: 0403:FE76
77 77 # Baum [VarioPro 80 (80 cells)]
78   -ENV{PRODUCT}=="403/fe76/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  78 +ENV{PRODUCT}=="403/fe76/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
79 79  
80 80 # Device: 0403:FE77
81 81 # Baum [VarioPro 64 (64 cells)]
82   -ENV{PRODUCT}=="403/fe77/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  82 +ENV{PRODUCT}=="403/fe77/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
83 83  
84 84 # Device: 0452:0100
85 85 # Metec [all models]
86   -ENV{PRODUCT}=="452/100/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  86 +ENV{PRODUCT}=="452/100/*", ENV{BRLTTY_BRAILLE_DRIVER}="mt", GOTO="brltty_usb_run"
87 87  
88 88 # Device: 045E:930A
89 89 # HIMS [Braille Sense (USB 1.1)]
90 90 # HIMS [Braille Sense (USB 2.0)]
91 91 # HIMS [Braille Sense U2 (USB 2.0)]
92   -ENV{PRODUCT}=="45e/930a/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  92 +ENV{PRODUCT}=="45e/930a/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run"
93 93  
94 94 # Device: 045E:930B
95 95 # HIMS [Braille Edge]
96   -ENV{PRODUCT}=="45e/930b/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  96 +ENV{PRODUCT}=="45e/930b/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run"
97 97  
98 98 # Device: 06B0:0001
99 99 # Alva [Satellite (5nn)]
100   -ENV{PRODUCT}=="6b0/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  100 +ENV{PRODUCT}=="6b0/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run"
101 101  
102 102 # Device: 0798:0001
103 103 # Voyager [all models]
104   -ENV{PRODUCT}=="798/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  104 +ENV{PRODUCT}=="798/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="vo", GOTO="brltty_usb_run"
105 105  
106 106 # Device: 0798:0600
107 107 # Alva [Voyager Protocol Converter]
108   -ENV{PRODUCT}=="798/600/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  108 +ENV{PRODUCT}=="798/600/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run"
109 109  
110 110 # Device: 0798:0624
111 111 # Alva [BC624]
112   -ENV{PRODUCT}=="798/624/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  112 +ENV{PRODUCT}=="798/624/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run"
113 113  
114 114 # Device: 0798:0640
115 115 # Alva [BC640]
116   -ENV{PRODUCT}=="798/640/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  116 +ENV{PRODUCT}=="798/640/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run"
117 117  
118 118 # Device: 0798:0680
119 119 # Alva [BC680]
120   -ENV{PRODUCT}=="798/680/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  120 +ENV{PRODUCT}=="798/680/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run"
121 121  
122 122 # Device: 0904:2000
123 123 # Baum [VarioPro 40 (40 cells)]
124   -ENV{PRODUCT}=="904/2000/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  124 +ENV{PRODUCT}=="904/2000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
125 125  
126 126 # Device: 0904:2001
127 127 # Baum [EcoVario 24 (24 cells)]
128   -ENV{PRODUCT}=="904/2001/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  128 +ENV{PRODUCT}=="904/2001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
129 129  
130 130 # Device: 0904:2002
131 131 # Baum [EcoVario 40 (40 cells)]
132   -ENV{PRODUCT}=="904/2002/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  132 +ENV{PRODUCT}=="904/2002/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
133 133  
134 134 # Device: 0904:2007
135 135 # Baum [VarioConnect 40 (40 cells)]
136   -ENV{PRODUCT}=="904/2007/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  136 +ENV{PRODUCT}=="904/2007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
137 137  
138 138 # Device: 0904:2008
139 139 # Baum [VarioConnect 32 (32 cells)]
140   -ENV{PRODUCT}=="904/2008/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  140 +ENV{PRODUCT}=="904/2008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
141 141  
142 142 # Device: 0904:2009
143 143 # Baum [VarioConnect 24 (24 cells)]
144   -ENV{PRODUCT}=="904/2009/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  144 +ENV{PRODUCT}=="904/2009/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
145 145  
146 146 # Device: 0904:2010
147 147 # Baum [VarioConnect 64 (64 cells)]
148   -ENV{PRODUCT}=="904/2010/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  148 +ENV{PRODUCT}=="904/2010/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
149 149  
150 150 # Device: 0904:2011
151 151 # Baum [VarioConnect 80 (80 cells)]
152   -ENV{PRODUCT}=="904/2011/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  152 +ENV{PRODUCT}=="904/2011/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
153 153  
154 154 # Device: 0904:2014
155 155 # Baum [EcoVario 32 (32 cells)]
156   -ENV{PRODUCT}=="904/2014/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  156 +ENV{PRODUCT}=="904/2014/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
157 157  
158 158 # Device: 0904:2015
159 159 # Baum [EcoVario 64 (64 cells)]
160   -ENV{PRODUCT}=="904/2015/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  160 +ENV{PRODUCT}=="904/2015/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
161 161  
162 162 # Device: 0904:2016
163 163 # Baum [EcoVario 80 (80 cells)]
164   -ENV{PRODUCT}=="904/2016/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  164 +ENV{PRODUCT}=="904/2016/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
165 165  
166 166 # Device: 0904:3000
167 167 # Baum [Refreshabraille 18 (18 cells)]
168   -ENV{PRODUCT}=="904/3000/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  168 +ENV{PRODUCT}=="904/3000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
169 169  
170 170 # Device: 0904:3001
171 171 # Baum [Refreshabraille 18 (18 cells)]
172   -ENV{PRODUCT}=="904/3001/*", ENV{BRLTTY_BRAILLE_DRIVER}="auto", GOTO="brltty_usb_run"
  172 +ENV{PRODUCT}=="904/3001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run"
173 173  
174 174 # Device: 0904:4004
175