Commit 6a26ecf76939e1b67ae86c84ec3cc81bc2b3c5ec

Authored by Mario Lang
1 parent be26d4ea

Imported Upstream version 4.0

Showing 1669 changed files with 234461 additions and 157173 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 1669 files displayed.

Bindings/Caml/Makefile.in
... ... @@ -2,13 +2,14 @@
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-2008 by The BRLTTY Developers.
  5 +# Copyright (C) 1995-2009 by The BRLTTY Developers.
6 6 #
7 7 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 #
9 9 # This is free software, placed under the terms of the
10 10 # GNU General Public License, as published by the Free Software
11   -# Foundation. Please see the file COPYING for details.
  11 +# Foundation; either version 2 of the License, or (at your option) any
  12 +# later version. Please see the file LICENSE-GPL for details.
12 13 #
13 14 # Web Page: http://mielke.cc/brltty/
14 15 #
... ... @@ -39,7 +40,7 @@ OCAML_MISC = $(SRC_DIR)/META brlapi.mli brlapi.cmi
39 40  
40 41 OCAML_CLIBS = @OCAML_CLIBS@
41 42  
42   -OCAML_DESTDIR = $(INSTALL_ROOT)$(exec_prefix)$(OCAMLLIB)
  43 +OCAML_DESTDIR = $(INSTALL_ROOT)$(OCAMLLIB)
43 44 OCAML_PKGDIR = $(OCAML_DESTDIR)/$(OCAML_LIB)
44 45 OCAML_STUBDIR = $(OCAML_DESTDIR)/stublibs
45 46 OCAML_STUB = dll$(OCAML_LIB)_stubs.so
... ...
Bindings/Caml/brlapi_stubs.c
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2005-2008 by
5   - * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
  4 + * Copyright (C) 2005-2009 by
  5 + * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
6 6 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 * All rights reserved.
8 8 *
... ... @@ -10,9 +10,8 @@
10 10 *
11 11 * This is free software, placed under the terms of the
12 12 * GNU Lesser General Public License, as published by the Free Software
13   - * Foundation; either version 2.1 of the License,
14   - * or (at your option) any later version.
15   - * Please see the file COPYING-API for details.
  13 + * Foundation; either version 2.1 of the License, or (at your option) any
  14 + * later version. Please see the file LICENSE-LGPL for details.
16 15 *
17 16 * Web Page: http://mielke.cc/brltty/
18 17 *
... ... @@ -419,7 +418,7 @@ CAMLprim value brlapiml_leaveRawMode(value handle, value unit)
419 418 CAMLprim value brlapiml_sendRaw(value handle, value str)
420 419 {
421 420 CAMLparam2(handle, str);
422   - ssize_t res;
  421 + int res;
423 422 unsigned char packet[BRLAPI_MAXPACKETSIZE];
424 423 ssize_t i, size = MIN(sizeof(packet), caml_string_length(str));
425 424 for (i=0; i<size; i++) packet[i] = Byte(str, i);
... ... @@ -431,7 +430,7 @@ CAMLprim value brlapiml_recvRaw(value handle, value unit)
431 430 {
432 431 CAMLparam2(handle, unit);
433 432 unsigned char packet[BRLAPI_MAXPACKETSIZE];
434   - ssize_t i, size;
  433 + int i, size;
435 434 CAMLlocal1(str);
436 435 brlapiCheckError(recvRaw, &size, packet, sizeof(packet));
437 436 str = caml_alloc_string(size);
... ...
Bindings/Caml/constants.awk
... ... @@ -2,13 +2,14 @@
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-2008 by The BRLTTY Developers.
  5 +# Copyright (C) 1995-2009 by The BRLTTY Developers.
6 6 #
7 7 # BRLTTY comes with ABSOLUTELY NO WARRANTY.
8 8 #
9 9 # This is free software, placed under the terms of the
10 10 # GNU General Public License, as published by the Free Software
11   -# Foundation. Please see the file COPYING for details.
  11 +# Foundation; either version 2 of the License, or (at your option) any
  12 +# later version. Please see the file LICENSE-GPL for details.
12 13 #
13 14 # Web Page: http://mielke.cc/brltty/
14 15 #
... ...
Bindings/Caml/main.ml
1 1 (*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2002-2008 by
5   - * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
  4 + * Copyright (C) 2002-2009 by
  5 + * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
6 6 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 * All rights reserved.
8 8 *
... ... @@ -10,9 +10,8 @@
10 10 *
11 11 * This is free software, placed under the terms of the
12 12 * GNU Lesser General Public License, as published by the Free Software
13   - * Foundation; either version 2.1 of the License,
14   - * or (at your option) any later version.
15   - * Please see the file COPYING-API for details.
  13 + * Foundation; either version 2.1 of the License, or (at your option) any
  14 + * later version. Please see the file LICENSE-LGPL for details.
16 15 *
17 16 * Web Page: http://mielke.cc/brltty/
18 17 *
... ...
Bindings/Caml/main.mli
1 1 (*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2002-2008 by
5   - * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
  4 + * Copyright (C) 2002-2009 by
  5 + * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
6 6 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 * All rights reserved.
8 8 *
... ... @@ -10,9 +10,8 @@
10 10 *
11 11 * This is free software, placed under the terms of the
12 12 * GNU Lesser General Public License, as published by the Free Software
13   - * Foundation; either version 2.1 of the License,
14   - * or (at your option) any later version.
15   - * Please see the file COPYING-API for details.
  13 + * Foundation; either version 2.1 of the License, or (at your option) any
  14 + * later version. Please see the file LICENSE-LGPL for details.
16 15 *
17 16 * Web Page: http://mielke.cc/brltty/
18 17 *
... ... @@ -29,8 +28,8 @@ BRLAPI_RELEASE
29 28 BRLAPI_MAJOR
30 29 BRLAPI_MINOR
31 30 BRLAPI_REVISION
32   -Faire un fichier .in: @VAR@ est remplacé par la valeur de VAR
33   -telle que définie dans configure.ac.
  31 +Faire un fichier .in: @VAR@ est remplacé par la valeur de VAR
  32 +telle que définie dans configure.ac.
34 33 *)
35 34  
36 35 (*
... ... @@ -42,7 +41,7 @@ BRLAPI_SOCKETPATH
42 41 BRLAPI_ETCDIR
43 42 BRLAPI_AUTHKEYFILE
44 43 BRLAPI_DEFAUTH
45   -Idem que précédemmment
  44 +Idem que précédemmment
46 45 C'est du ni<eau proto. Faut-il binder ?
47 46 *)
48 47  
... ... @@ -144,7 +143,7 @@ external write :
144 143 BRLAPI_KEYCODE_MAX
145 144 Les constantes pour travailler sur les flags de touches ?
146 145 Les KEY_SYM ?
147   -Oui: pour être cohérent avec le fait de fournir le int64
  146 +Oui: pour être cohérent avec le fait de fournir le int64
148 147 Flags: entiers.
149 148 *)
150 149  
... ...
Bindings/Java/Brlapi.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/ConnectionSettings.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/DisplaySize.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/Error.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/Exception.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/Key.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/Makefile.in
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2006-2008 by
  4 +# Copyright (C) 2006-2009 by
5 5 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 # Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10 10 # This is free software, placed under the terms of the
11 11 # GNU Lesser General Public License, as published by the Free Software
12   -# Foundation; either version 2.1 of the License,
13   -# or (at your option) any later version.
14   -# Please see the file COPYING-API for details.
  12 +# Foundation; either version 2.1 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-LGPL for details.
15 14 #
16 15 # Web Page: http://mielke.cc/brltty/
17 16 #
... ... @@ -27,14 +26,14 @@ JAR = @JAR@
27 26  
28 27 JAVA_JAR = @JAVA_JAR@
29 28 JAVA_JAR_DIR = @JAVA_JAR_DIR@
30   -JAVA_JAR_DESTDIR = $(INSTALL_ROOT)$(prefix)
  29 +JAVA_JAR_DESTDIR = $(INSTALL_ROOT)
31 30  
32 31 JAVA_JNI = @JAVA_JNI@
33 32 JAVA_JNI_DIR = @JAVA_JNI_DIR@
34 33 JAVA_JNI_HDR = @JAVA_JNI_HDR@
35 34 JAVA_JNI_INC = @JAVA_JNI_INC@
36 35 JAVA_JNI_FLAGS = @JAVA_JNI_FLAGS@
37   -JAVA_JNI_DESTDIR = $(INSTALL_ROOT)$(exec_prefix)
  36 +JAVA_JNI_DESTDIR = $(INSTALL_ROOT)
38 37  
39 38 all: jar jni doc
40 39  
... ...
Bindings/Java/Native.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/Test.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/WriteArguments.java
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/apitest
... ... @@ -2,7 +2,7 @@
2 2 ###############################################################################
3 3 # libbrlapi - A library providing access to braille terminals for applications.
4 4 #
5   -# Copyright (C) 2006-2008 by
  5 +# Copyright (C) 2006-2009 by
6 6 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 # Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
8 8 #
... ... @@ -10,9 +10,8 @@
10 10 #
11 11 # This is free software, placed under the terms of the
12 12 # GNU Lesser General Public License, as published by the Free Software
13   -# Foundation; either version 2.1 of the License,
14   -# or (at your option) any later version.
15   -# Please see the file COPYING-API for details.
  13 +# Foundation; either version 2.1 of the License, or (at your option) any
  14 +# later version. Please see the file LICENSE-LGPL for details.
16 15 #
17 16 # Web Page: http://mielke.cc/brltty/
18 17 #
... ...
Bindings/Java/bindings.c
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2006-2008 by
  4 + * Copyright (C) 2006-2009 by
5 5 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6   - * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
  6 + * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 *
8 8 * libbrlapi comes with ABSOLUTELY NO WARRANTY.
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Java/bindings.m4
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2006-2008 by
  4 +# Copyright (C) 2006-2009 by
5 5 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 # Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10 10 # This is free software, placed under the terms of the
11 11 # GNU Lesser General Public License, as published by the Free Software
12   -# Foundation; either version 2.1 of the License,
13   -# or (at your option) any later version.
14   -# Please see the file COPYING-API for details.
  12 +# Foundation; either version 2.1 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-LGPL for details.
15 14 #
16 15 # Web Page: http://mielke.cc/brltty/
17 16 #
... ...
Bindings/Java/constants.awk
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2006-2008 by
  4 +# Copyright (C) 2006-2009 by
5 5 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6 6 # Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10 10 # This is free software, placed under the terms of the
11 11 # GNU Lesser General Public License, as published by the Free Software
12   -# Foundation; either version 2.1 of the License,
13   -# or (at your option) any later version.
14   -# Please see the file COPYING-API for details.
  12 +# Foundation; either version 2.1 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-LGPL for details.
15 14 #
16 15 # Web Page: http://mielke.cc/brltty/
17 16 #
... ...
Bindings/Lisp/Makefile.in
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2006-2008 by Mario Lang <mlang@delysid.org>
  4 +# Copyright (C) 2006-2009 by Mario Lang <mlang@delysid.org>
5 5 #
6 6 # libbrlapi comes with ABSOLUTELY NO WARRANTY.
7 7 #
8 8 # This is free software, placed under the terms of the
9 9 # GNU Lesser General Public License, as published by the Free Software
10   -# Foundation; either version 2.1 of the License,
11   -# or (at your option) any later version.
12   -# Please see the file COPYING-API for details.
  10 +# Foundation; either version 2.1 of the License, or (at your option) any
  11 +# later version. Please see the file LICENSE-LGPL for details.
13 12 #
14 13 # Web Page: http://mielke.cc/brltty/
15 14 #
... ...
Bindings/Lisp/brlapi.asd
1 1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2 2 ; libbrlapi - A library providing access to braille terminals for applications.
3 3 ;
4   -; Copyright (C) 2006-2008 by Mario Lang <mlang@delysid.org>
  4 +; Copyright (C) 2006-2009 by Mario Lang <mlang@delysid.org>
5 5 ;
6 6 ; libbrlapi comes with ABSOLUTELY NO WARRANTY.
7 7 ;
8 8 ; This is free software, placed under the terms of the
9 9 ; GNU Lesser General Public License, as published by the Free Software
10   -; Foundation; either version 2.1 of the License,
11   -; or (at your option) any later version.
12   -; Please see the file COPYING-API for details.
  10 +; Foundation; either version 2.1 of the License, or (at your option) any
  11 +; later version. Please see the file LICENSE-LGPL for details.
13 12 ;
14 13 ; Web Page: http://mielke.cc/brltty/
15 14 ;
... ...
Bindings/Lisp/brlapi.lisp
1 1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2 2 ; libbrlapi - A library providing access to braille terminals for applications.
3 3 ;
4   -; Copyright (C) 2006-2008 by Mario Lang <mlang@delysid.org>
  4 +; Copyright (C) 2006-2009 by Mario Lang <mlang@delysid.org>
5 5 ;
6 6 ; libbrlapi comes with ABSOLUTELY NO WARRANTY.
7 7 ;
8 8 ; This is free software, placed under the terms of the
9 9 ; GNU Lesser General Public License, as published by the Free Software
10   -; Foundation; either version 2.1 of the License,
11   -; or (at your option) any later version.
12   -; Please see the file COPYING-API for details.
  10 +; Foundation; either version 2.1 of the License, or (at your option) any
  11 +; later version. Please see the file LICENSE-LGPL for details.
13 12 ;
14 13 ; Web Page: http://mielke.cc/brltty/
15 14 ;
... ... @@ -119,7 +118,7 @@ Return a DISPLAY object which can further be used to interact with BRLTTY.&quot;
119 118  
120 119 (defmethod driver-name ((obj display))
121 120 "Return the currently used driver name."
122   - (with-foreign-pointer-as-string (str 64 str-size)
  121 + (with-foreign-pointer-as-string ((str str-size) 64)
123 122 (foreign-funcall "brlapi__getDriverName" :pointer (display-handle obj)
124 123 :string str :int str-size brlapi-code)))
125 124  
... ...
Bindings/Python/Makefile.in
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2005-2008 by
  4 +# Copyright (C) 2005-2009 by
5 5 # Alexis Robert <alexissoft@free.fr>
6 6 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10 10 # This is free software, placed under the terms of the
11 11 # GNU Lesser General Public License, as published by the Free Software
12   -# Foundation; either version 2.1 of the License,
13   -# or (at your option) any later version.
14   -# Please see the file COPYING-API for details.
  12 +# Foundation; either version 2.1 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-LGPL for details.
15 14 #
16 15 # Web Page: http://mielke.cc/brltty/
17 16 #
... ... @@ -31,7 +30,7 @@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
31 30 PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
32 31 PYREXC = @PYREXC@
33 32 PYREXC_CFLAGS = @PYREXC_CFLAGS@
34   -PYTHON_DESTDIR = $(INSTALL_ROOT)$(exec_prefix)
  33 +PYTHON_DESTDIR = $(INSTALL_ROOT)
35 34  
36 35 PYTHON_MODULE = $(API_NAME)
37 36 PYTHON_API = $(PYTHON_MODULE).$(LIB_EXT)
... ... @@ -42,6 +41,7 @@ $(PYTHON_API): brlapi.auto.c $(API_HDRS) brlapi
42 41 set -- --quiet build --build-temp .; \
43 42 [ "@host_os@" != "mingw32" ] || set -- "$${@}" --compiler mingw32; \
44 43 $(PYTHON) ./setup.py "$${@}"
  44 + [ "@host_os@" != "mingw32" ] || $(PYTHON) ./setup.py --quiet bdist_wininst --skip-build
45 45  
46 46 brlapi.auto.c: $(SRC_DIR)/brlapi.pyx $(SRC_DIR)/c_brlapi.pxd constants.auto.pyx
47 47 $(PYREXC) -I. -o $@ $(SRC_DIR)/brlapi.pyx
... ...
Bindings/Python/bindings.c
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2005-2008 by
  4 + * Copyright (C) 2005-2009 by
5 5 * Alexis Robert <alexissoft@free.fr>
6 6 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Python/bindings.h
1 1 /*
2 2 * libbrlapi - A library providing access to braille terminals for applications.
3 3 *
4   - * Copyright (C) 2005-2008 by
  4 + * Copyright (C) 2005-2009 by
5 5 * Alexis Robert <alexissoft@free.fr>
6 6 * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 *
... ... @@ -9,9 +9,8 @@
9 9 *
10 10 * This is free software, placed under the terms of the
11 11 * GNU Lesser General Public License, as published by the Free Software
12   - * Foundation; either version 2.1 of the License,
13   - * or (at your option) any later version.
14   - * Please see the file COPYING-API for details.
  12 + * Foundation; either version 2.1 of the License, or (at your option) any
  13 + * later version. Please see the file LICENSE-LGPL for details.
15 14 *
16 15 * Web Page: http://mielke.cc/brltty/
17 16 *
... ...
Bindings/Python/bindings.m4
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2005-2008 by
  4 +# Copyright (C) 2005-2009 by
5 5 # Alexis Robert <alexissoft@free.fr>
6 6 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10 10 # This is free software, placed under the terms of the
11 11 # GNU Lesser General Public License, as published by the Free Software
12   -# Foundation; either version 2.1 of the License,
13   -# or (at your option) any later version.
14   -# Please see the file COPYING-API for details.
  12 +# Foundation; either version 2.1 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-LGPL for details.
15 14 #
16 15 # Web Page: http://mielke.cc/brltty/
17 16 #
... ...
Bindings/Python/brlapi.pyx
... ... @@ -8,26 +8,37 @@ This documentation is only a python helper, you should also read C manual pages.
8 8 Example :
9 9 import brlapi
10 10 import errno
  11 +import Xlib.keysymdef.miscellany
11 12 try:
12 13 b = brlapi.Connection()
13 14 b.enterTtyMode()
14 15 b.ignoreKeys(brlapi.rangeType_all,[0])
  16 +
  17 + # Accept the home, window up and window down braille commands
15 18 b.acceptKeys(brlapi.rangeType_command,[brlapi.KEY_TYPE_CMD|brlapi.KEY_CMD_HOME, brlapi.KEY_TYPE_CMD|brlapi.KEY_CMD_WINUP, brlapi.KEY_TYPE_CMD|brlapi.KEY_CMD_WINDN])
16   - b.writeText("Press home or winup/dn to continue ... ¤")
  19 +
  20 + # Accept the tab key
  21 + b.acceptKeys(brlapi.rangeType_key,[brlapi.KEY_TYPE_SYM|Xlib.keysymdef.miscellany.XK_Tab])
  22 +
  23 + b.writeText("Press home, winup/dn or tab to continue ... ¤")
17 24 key = b.readKey()
  25 +
18 26 k = b.expandKeyCode(key)
19 27 b.writeText("Key %ld (%x %x %x %x) !" % (key, k["type"], k["command"], k["argument"], k["flags"]))
20 28 b.writeText(None,1)
21 29 b.readKey()
  30 +
22 31 underline = chr(brlapi.DOT7 + brlapi.DOT8)
23 32 # Note: center() can take two arguments only starting from python 2.4
24 33 b.write(
25 34 regionBegin = 1,
26 35 regionSize = 40,
27   - text = u"Press any key to exit ¤ ",
  36 + text = u"Press any key to exit ¤ ",
28 37 orMask = "".center(21,underline) + "".center(19,chr(0)))
  38 +
29 39 b.acceptKeys(brlapi.rangeType_all,[0])
30 40 b.readKey()
  41 +
31 42 b.leaveTtyMode()
32 43  
33 44 except brlapi.ConnectionError, e:
... ... @@ -47,7 +58,7 @@ except brlapi.ConnectionError, e:
47 58 ###############################################################################
48 59 # libbrlapi - A library providing access to braille terminals for applications.
49 60 #
50   -# Copyright (C) 2005-2008 by
  61 +# Copyright (C) 2005-2009 by
51 62 # Alexis Robert <alexissoft@free.fr>
52 63 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
53 64 #
... ... @@ -55,9 +66,8 @@ except brlapi.ConnectionError, e:
55 66 #
56 67 # This is free software, placed under the terms of the
57 68 # GNU Lesser General Public License, as published by the Free Software
58   -# Foundation; either version 2.1 of the License,
59   -# or (at your option) any later version.
60   -# Please see the file COPYING-API for details.
  69 +# Foundation; either version 2.1 of the License, or (at your option) any
  70 +# later version. Please see the file LICENSE-LGPL for details.
61 71 #
62 72 # Web Page: http://mielke.cc/brltty/
63 73 #
... ... @@ -67,63 +77,41 @@ except brlapi.ConnectionError, e:
67 77 cimport c_brlapi
68 78 include "constants.auto.pyx"
69 79  
70   -cdef class OperationError:
  80 +class OperationError(Exception):
71 81 """Error while performing some operation"""
72   -
73   - cdef c_brlapi.brlapi_error_t error
74   -
75 82 def __init__(self):
76   - self.error = c_brlapi.brlapi_error
77   -
78   - property brlerrno:
79   - """Braille error"""
80   - def __get__(self):
81   - return self.error.brlerrno
82   -
83   - property libcerrno:
84   - """C library error"""
85   - def __get__(self):
86   - return self.error.libcerrno
87   -
88   - property gaierrno:
89   - """Getaddrinfo error"""
90   - def __get__(self):
91   - return self.error.gaierrno
92   -
93   - property errfun:
94   - """Function in which error occurred"""
95   - def __get__(self):
96   - return self.error.errfun
  83 + self.brlerrno = c_brlapi.brlapi_error.brlerrno
  84 + self.libcerrno = c_brlapi.brlapi_error.libcerrno
  85 + self.gaierrno = c_brlapi.brlapi_error.gaierrno
  86 + self.errfun = c_brlapi.brlapi_error.errfun
97 87  
98 88 def __str__(self):
99   - return c_brlapi.brlapi_strerror(&self.error)
100   -
101   -cdef class ConnectionError(OperationError):
  89 + cdef c_brlapi.brlapi_error_t error
  90 + error.brlerrno = self.brlerrno
  91 + error.libcerrno = self.libcerrno
  92 + error.gaierrno = self.gaierrno
  93 + str = self.errfun
  94 + error.errfun = str
  95 + return c_brlapi.brlapi_strerror(&error)
  96 +
  97 +class ConnectionError(OperationError):
102 98 """Error while connecting to BrlTTY"""
103 99  
104   - cdef c_brlapi.brlapi_connectionSettings_t settings
105   -
106 100 def __init__(self, host, auth):
107 101 OperationError.__init__(self)
108   - self.settings.host = c_brlapi.strdup(host)
109   - self.settings.auth = c_brlapi.strdup(auth)
110   -
111   - def __del__(self):
112   - c_brlapi.free(self.settings.host)
113   - c_brlapi.free(self.settings.auth)
  102 + self.host = host
  103 + self.auth = auth
114 104  
115 105 def __str__(self):
116   - return "couldn't connect to %s with key %s: %s" % (self.settings.host,self.settings.auth,c_brlapi.brlapi_strerror(&self.error))
  106 + return "couldn't connect to %s with key %s: %s" % (self.host,self.auth,OperationError.__str__(self))
117 107  
118   - property host:
  108 + def host(self):
119 109 """Host of BRLTTY server"""
120   - def __get__(self):
121   - return self.settings.host
  110 + return self.settings.host
122 111  
123   - property auth:
  112 + def auth(self):
124 113 """Authentication method used"""
125   - def __get__(self):
126   - return self.settings.auth
  114 + return self.settings.auth
127 115  
128 116 cdef class WriteStruct:
129 117 """Structure containing arguments to be given to Connection.write()
... ... @@ -474,6 +462,10 @@ cdef class Connection:
474 462 cdef int retval
475 463 cdef char *c_dots
476 464 cdef unsigned char *c_udots
  465 + (x, y) = self.displaySize
  466 + dispSize = x * y
  467 + if (len(dots) < dispSize):
  468 + dots = dots + "".center(dispSize - len(dots), '\0')
477 469 c_dots = dots
478 470 c_udots = <unsigned char *>c_dots
479 471 c_brlapi.Py_BEGIN_ALLOW_THREADS
... ...
Bindings/Python/c_brlapi.pxd
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2005-2008 by
  4 +# Copyright (C) 2005-2009 by
5 5 # Alexis Robert <alexissoft@free.fr>
6 6 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10 10 # This is free software, placed under the terms of the
11 11 # GNU Lesser General Public License, as published by the Free Software
12   -# Foundation; either version 2.1 of the License,
13   -# or (at your option) any later version.
14   -# Please see the file COPYING-API for details.
  12 +# Foundation; either version 2.1 of the License, or (at your option) any
  13 +# later version. Please see the file LICENSE-LGPL for details.
15 14 #
16 15 # Web Page: http://mielke.cc/brltty/
17 16 #
... ...
Bindings/Python/constants.awk
1 1 ###############################################################################
2 2 # libbrlapi - A library providing access to braille terminals for applications.
3 3 #
4   -# Copyright (C) 2005-2008 by
  4 +# Copyright (C) 2005-2009 by
5 5 # Alexis Robert <alexissoft@free.fr>
6 6 # Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7 7 #
... ... @@ -9,9 +9,8 @@
9 9 #
10