From 026bc9e4f28c920d57ba0627ea89eb3d094cfac7 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Mon, 4 Jul 2016 18:24:27 -0400 Subject: [PATCH 01/21] Added a slight header to the fenrir.py file. --- src/fenrir.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/fenrir.py b/src/fenrir.py index d246e247..d38ba956 100755 --- a/src/fenrir.py +++ b/src/fenrir.py @@ -1,4 +1,8 @@ #!/bin/python + +# Fenrir TTY screen reader +# By Chrys, Storm Dragon, and contributers. + import hashlib import difflib import textwrap From 903944ca250baf9227bffcb40637df2074101d4a Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Mon, 4 Jul 2016 23:17:19 -0400 Subject: [PATCH 02/21] Speech class added for es.py. --- src/speech/es.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/speech/es.py b/src/speech/es.py index e69de29b..10dbc51e 100644 --- a/src/speech/es.py +++ b/src/speech/es.py @@ -0,0 +1,16 @@ +#!/usr/bin/python + +# Espeak driver + +class speech(): + def __init__(): + pass + + def start_speech(text, queueable=True): + if queueable == False: stop_speech() + + def stop_speech(): + pass + + def clear_speech_buffer(): + pass From 9e84f8c78e89fbd4c6230b6f37ad9192757c8824 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 09:44:13 +0200 Subject: [PATCH 03/21] Fix class some syntax and name problems. --- src/speech/es.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/speech/es.py b/src/speech/es.py index 10dbc51e..c5625e84 100644 --- a/src/speech/es.py +++ b/src/speech/es.py @@ -3,14 +3,14 @@ # Espeak driver class speech(): - def __init__(): + def __init__(self): pass - def start_speech(text, queueable=True): - if queueable == False: stop_speech() + def speak(text, queueable=True): + if queueable == False: self.stop() - def stop_speech(): + def stop(self): pass - def clear_speech_buffer(): + def clear_buffer(self): pass From d602209b47bd1d46ef3f406c2d4cecfe91e70005 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 09:55:29 +0200 Subject: [PATCH 04/21] some todos --- TODO | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 TODO diff --git a/TODO b/TODO new file mode 100644 index 00000000..fdb432eb --- /dev/null +++ b/TODO @@ -0,0 +1,12 @@ +- Input and shortcuts +http://python-evdev.readthedocs.io/en/latest/tutorial.html +- detect all TTYs where users are logged in (maybe PAM notification) +- detect collumns in TTYs automaticaly. +- move from VCS to VCSA and parese the Attributes +- implement command structure (next_[line,word,char], prev_[line,word,char], and others +- implement braille +http://mielke.cc/brltty/doc/Manual-BrlAPI/English/BrlAPI.html + +- implement speechdriver espeak +- implement speechdriver speechd +- implement speechdriver generci From 6f17db33035b1303798266d62c239cb7853ec3f3 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:07:14 +0200 Subject: [PATCH 05/21] add Todos --- TODO | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index fdb432eb..8fd504a3 100644 --- a/TODO +++ b/TODO @@ -9,4 +9,7 @@ http://mielke.cc/brltty/doc/Manual-BrlAPI/English/BrlAPI.html - implement speechdriver espeak - implement speechdriver speechd -- implement speechdriver generci +- implement speechdriver generic + +- threading ReadContent, ReadShortcuts, executeCommands, listenNewTTYsForListen, controllThread (main) +- debugging From cf6cc0482a532a29245d1a4a06d6a765f5089403 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:10:02 +0200 Subject: [PATCH 06/21] add Todos --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 8fd504a3..6e55354d 100644 --- a/TODO +++ b/TODO @@ -13,3 +13,4 @@ http://mielke.cc/brltty/doc/Manual-BrlAPI/English/BrlAPI.html - threading ReadContent, ReadShortcuts, executeCommands, listenNewTTYsForListen, controllThread (main) - debugging +- Settings (make it configureable) From a1ba86b45aed679a66c2404ba09ab98e28fbc79e Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:17:24 +0200 Subject: [PATCH 07/21] add Todos --- TODO | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 6e55354d..8b9786b8 100644 --- a/TODO +++ b/TODO @@ -1,16 +1,24 @@ - Input and shortcuts http://python-evdev.readthedocs.io/en/latest/tutorial.html + - detect all TTYs where users are logged in (maybe PAM notification) - detect collumns in TTYs automaticaly. - move from VCS to VCSA and parese the Attributes + - implement command structure (next_[line,word,char], prev_[line,word,char], and others - implement braille http://mielke.cc/brltty/doc/Manual-BrlAPI/English/BrlAPI.html - implement speechdriver espeak -- implement speechdriver speechd -- implement speechdriver generic +https://github.com/relsi/python-espeak +- implement speechdriver speechd +https://git.gnome.org/browse/orca/tree/src/orca/speech.py +https://git.gnome.org/browse/orca/tree/src/orca/speechdispatcherfactory.py +http://devel.freebsoft.org/doc/speechd/speech-dispatcher.html#Client-Programming + +- implement speechdriver generic (say) - threading ReadContent, ReadShortcuts, executeCommands, listenNewTTYsForListen, controllThread (main) - debugging - Settings (make it configureable) +- beeps (sound Icons) From 13edac3462236c02ab3900ea26977c59abd86890 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:24:45 +0200 Subject: [PATCH 08/21] add Todos --- TODO | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TODO b/TODO index 8b9786b8..4f33e290 100644 --- a/TODO +++ b/TODO @@ -4,6 +4,10 @@ http://python-evdev.readthedocs.io/en/latest/tutorial.html - detect all TTYs where users are logged in (maybe PAM notification) - detect collumns in TTYs automaticaly. - move from VCS to VCSA and parese the Attributes +http://linux.die.net/man/4/vcsa +http://man.cx/vcsa(4)/de +http://manpages.org/display-vcsa/7 +https://en.wikipedia.org/wiki/Virtual_console - implement command structure (next_[line,word,char], prev_[line,word,char], and others - implement braille @@ -22,3 +26,5 @@ http://devel.freebsoft.org/doc/speechd/speech-dispatcher.html#Client-Programming - debugging - Settings (make it configureable) - beeps (sound Icons) +- autostart systemd + From 3d6d72a5d305a89cb32dfc33e4c7f682477b4034 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:28:59 +0200 Subject: [PATCH 09/21] add isInitialized --- src/speech/es.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/speech/es.py b/src/speech/es.py index c5625e84..7f55fc88 100644 --- a/src/speech/es.py +++ b/src/speech/es.py @@ -3,6 +3,8 @@ # Espeak driver class speech(): + isInitialized = False + def __init__(self): pass From 0b6dd8fb0fd3154403c6718595c2239628deee29 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:43:28 +0200 Subject: [PATCH 10/21] add isInitialized --- src/speech/es.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/speech/es.py b/src/speech/es.py index 7f55fc88..4f3db5dd 100644 --- a/src/speech/es.py +++ b/src/speech/es.py @@ -6,7 +6,11 @@ class speech(): isInitialized = False def __init__(self): - pass + try: + pass + isInitialized = True + except: + initialized = False def speak(text, queueable=True): if queueable == False: self.stop() From 3a6f49970989f08bfdb637a979df5bd3b887346a Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 10:50:58 +0200 Subject: [PATCH 11/21] add Todos --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 4f33e290..1432fe35 100644 --- a/TODO +++ b/TODO @@ -12,6 +12,7 @@ https://en.wikipedia.org/wiki/Virtual_console - implement command structure (next_[line,word,char], prev_[line,word,char], and others - implement braille http://mielke.cc/brltty/doc/Manual-BrlAPI/English/BrlAPI.html +https://git.gnome.org/browse/orca/tree/src/orca/braille.py - implement speechdriver espeak https://github.com/relsi/python-espeak From 544c8d0a592433388cb663acffe956ac5bafa5fd Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 11:16:34 +0200 Subject: [PATCH 12/21] add requrements --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 965147c4..2de57aba 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # fenrir An TTY screenreader for Linux. + +# requirements +linux +python3 From 659999c4bad0f32f24cf7f3826169ecb0cefed66 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 11:18:35 +0200 Subject: [PATCH 13/21] add installatio --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2de57aba..5ee84812 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # fenrir -An TTY screenreader for Linux. +An TTY screenreader for Linux. Be careful, is just experimental now. # requirements linux python3 + +# installation +ToDO + From 7022eecc3163a42b5992e569aaf8a0bf5f0f4fca Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 11:23:00 +0200 Subject: [PATCH 14/21] add Todos --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 1432fe35..ab7e097c 100644 --- a/TODO +++ b/TODO @@ -28,4 +28,5 @@ http://devel.freebsoft.org/doc/speechd/speech-dispatcher.html#Client-Programming - Settings (make it configureable) - beeps (sound Icons) - autostart systemd +- translateable From 46ad3284a227a94589829b6216f6cce8b4078fa1 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 11:27:31 +0200 Subject: [PATCH 15/21] add unfinished systemd file --- autostart/systemd/fenrir.service | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 autostart/systemd/fenrir.service diff --git a/autostart/systemd/fenrir.service b/autostart/systemd/fenrir.service new file mode 100644 index 00000000..ca7d2c47 --- /dev/null +++ b/autostart/systemd/fenrir.service @@ -0,0 +1,11 @@ +[Unit] +Description=fenrir +#After= + +[Service] +ExecStart=path_to_executable +Type=forking +PIDFile=path_to_pidfile + +[Install] +WantedBy=default.target From 4c4a5ac6b09f61201f668aa4d3e3ca1c6728adaa Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 11:43:17 +0200 Subject: [PATCH 16/21] add Todos --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index ab7e097c..28d50ad1 100644 --- a/TODO +++ b/TODO @@ -28,5 +28,7 @@ http://devel.freebsoft.org/doc/speechd/speech-dispatcher.html#Client-Programming - Settings (make it configureable) - beeps (sound Icons) - autostart systemd +https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/System_Administrators_Guide/sect-Managing_Services_with_systemd-Unit_Files.html + - translateable From 0a7e5744ed51c29272ed7fdf8c38ea8d05bfb14d Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 14:35:57 +0200 Subject: [PATCH 17/21] got needed vcsa information --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 28d50ad1..7cd3f5f9 100644 --- a/TODO +++ b/TODO @@ -8,6 +8,7 @@ http://linux.die.net/man/4/vcsa http://man.cx/vcsa(4)/de http://manpages.org/display-vcsa/7 https://en.wikipedia.org/wiki/Virtual_console +every second byte is a attribute others are text. fast way: c[::2],c[1::2] - implement command structure (next_[line,word,char], prev_[line,word,char], and others - implement braille From 7934d432ecefd9d4e8daeb5a7cc8b1f387eb4866 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 14:40:02 +0200 Subject: [PATCH 18/21] column --- TODO | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 7cd3f5f9..1cd67a70 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,9 @@ http://python-evdev.readthedocs.io/en/latest/tutorial.html - detect all TTYs where users are logged in (maybe PAM notification) -- detect collumns in TTYs automaticaly. +- detect collumns in TTYs automaticaly. +it seems we have this info in vcsa + - move from VCS to VCSA and parese the Attributes http://linux.die.net/man/4/vcsa http://man.cx/vcsa(4)/de From a38b2534954212be6bc30a4318362ed0d7fc54b2 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 15:11:01 +0200 Subject: [PATCH 19/21] more attribute parsing information --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 1cd67a70..7c5abfaa 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,8 @@ http://man.cx/vcsa(4)/de http://manpages.org/display-vcsa/7 https://en.wikipedia.org/wiki/Virtual_console every second byte is a attribute others are text. fast way: c[::2],c[1::2] +http://manpages.ubuntu.com/manpages/precise/de/man4/vcs.4.html +https://docs.python.org/3/library/fcntl.html - implement command structure (next_[line,word,char], prev_[line,word,char], and others - implement braille From 72f3b48008bd36cc6cec015036c740e7081e0ad0 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 15:15:08 +0200 Subject: [PATCH 20/21] add more vcsa --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 7c5abfaa..768f2ca7 100644 --- a/TODO +++ b/TODO @@ -13,6 +13,7 @@ https://en.wikipedia.org/wiki/Virtual_console every second byte is a attribute others are text. fast way: c[::2],c[1::2] http://manpages.ubuntu.com/manpages/precise/de/man4/vcs.4.html https://docs.python.org/3/library/fcntl.html +http://rodrigorivas.serveblog.net/en/imagenes-desde-vt-con-vcsa/ - implement command structure (next_[line,word,char], prev_[line,word,char], and others - implement braille From 48709eab9e1304ca094175115d8c832d37539193 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 5 Jul 2016 16:56:53 +0200 Subject: [PATCH 21/21] tty --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 768f2ca7..7e1fd5b3 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,8 @@ http://python-evdev.readthedocs.io/en/latest/tutorial.html - detect all TTYs where users are logged in (maybe PAM notification) +http://serverfault.com/questions/306854/how-to-find-out-the-currently-active-linux-virtual-terminal-while-connected-via + - detect collumns in TTYs automaticaly. it seems we have this info in vcsa