From f56847797f87ec44b83fe91c9011d4ec0c1a639b Mon Sep 17 00:00:00 2001 From: chrys Date: Wed, 5 Oct 2016 22:12:31 +0200 Subject: [PATCH] history --- config/settings/settings.conf | 8 +- config/settings/settings.conf.chrys | 113 ---------------------------- src/fenrir/core/commandManager.py | 9 ++- src/fenrir/core/commands.py | 16 ++++ src/fenrir/core/environment.py | 1 + 5 files changed, 28 insertions(+), 119 deletions(-) delete mode 100644 config/settings/settings.conf.chrys diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 65c83fd0..ce851095 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -57,7 +57,7 @@ module=espeak voice= # Select the language you want fenrir to use. -language=english-us +language=de # Read new text as it happens? autoReadIncoming=True @@ -82,7 +82,7 @@ device=AUTO grabDevices=True ignoreShortcuts=False # the current shortcut layout located in /etc/fenrir/keyboard -keyboardLayout=desktop +keyboardLayout=test # echo chars while typing. charEcho=False # echo deleted chars @@ -95,8 +95,8 @@ interruptOnKeyPress=False doubleTapDelay=0.2 [general] -debugLevel=3 -punctuationLevel=some +debugLevel=0 +punctuationLevel=Some numberOfClipboards=10 # define the current fenrir key fenrirKeys=KEY_KP0,KEY_META diff --git a/config/settings/settings.conf.chrys b/config/settings/settings.conf.chrys deleted file mode 100644 index 68d7296e..00000000 --- a/config/settings/settings.conf.chrys +++ /dev/null @@ -1,113 +0,0 @@ -[sound] -# Turn sound on or off: -enabled=True - -# Select the driver used to play sounds, choices are generic and gstreamer. -# Sox is the default. -driver=generic - -# Sound themes. This is the pack of sounds used for sound alerts. -# Sound packs may be located at /usr/share/sounds -# For system wide availability, or ~/.local/share/fenrir/sounds -# For the current user. -theme=default - -# Sound volume controls how loud the sounds for your chosen soundpack are. -# 0 is quietest, 1.0 is loudest. -volume=1.0 - -# shell commands for generic sound driver -# the folowing variable are substituded -# fenrirVolume = the current volume setting -# fenrirSoundFile = the soundfile for an soundicon -# fenrirFrequence = the frequence to play -# fenrirDuration = the duration of the frequence -# the following command is used for play a soundfile -genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile -#the following command is used for generating a frequence beep -genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence - -[speech] -# Turn speech on or off: -enabled=True - -# Select speech driver, options are speechd (default) or espeak: -driver=speechd -#driver=espeak - - -# The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest. -rate=0.45 - -# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest. -pitch=0.5 -# Pitch for capital letters -capitalPitch=0.9 - -# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest. -volume=1.0 - -# Module is used for speech-dispatcher, to select the speech module you want to use. -# Consult speech-dispatcher's configuration and help ti find out which modules are available. -# The default is espeak. -module=espeak - -# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in espeak, -# or if using the espeak module in speech-dispatcher. To find out which voices are available, consult the documentation provided with your chosen synthesizer. -voice= - -# Select the language you want fenrir to use. -language=de - -# Read new text as it happens? -autoReadIncoming=True - -[braille] -#braille is not implemented yet -enabled=False -layout=en - -[screen] -driver=linux -encoding=cp850 -screenUpdateDelay=0.4 -suspendingScreen= -autodetectSuspendingScreen=True - -[keyboard] -driver=evdev -# filter input devices AUTO, ALL or a DEVICE NAME -device=AUTO -# gives fenrir exclusive access to the keyboard and let consume keystrokes. just disable on problems. -grabDevices=True -ignoreShortcuts=False -# the current shortcut layout located in /etc/fenrir/keyboard -keyboardLayout=test -# echo chars while typing. -charEcho=False -# echo deleted chars -charDeleteEcho=True -# echo word after pressing space -wordEcho=False -# interrupt speech on any keypress -interruptOnKeyPress=False -# timeout for double tap in sec -doubleTapDelay=0.2 - -[general] -debugLevel=1 -punctuationLevel=Some -numberOfClipboards=10 -# define the current fenrir key -fenrirKeys=KEY_KP0,KEY_META -timeFormat=%H:%M:%P -dateFormat=%A, %B %d, %Y -autoSpellCheck=True -spellCheckLanguage=en_US - -[promote] -enabled=True -inactiveTimeoutSec=120 -list= - - diff --git a/src/fenrir/core/commandManager.py b/src/fenrir/core/commandManager.py index 8af41fe1..c8cb31ee 100644 --- a/src/fenrir/core/commandManager.py +++ b/src/fenrir/core/commandManager.py @@ -43,6 +43,7 @@ class commandManager(): command_mod = importlib.util.module_from_spec(spec) spec.loader.exec_module(command_mod) self.env['commands'][section][fileName.upper()] = command_mod.command() + self.env['commandsIgnore'][section][fileName.upper()[fileName.upper().find('-')+1:]+'_IGNORE'] = False self.env['commands'][section][fileName.upper()].initialize(self.env) self.env['runtime']['debug'].writeDebugOut("Load command:" + section + "." + fileName.upper() ,debug.debugLevel.INFO) @@ -89,8 +90,12 @@ class commandManager(): for command in sorted(self.env['commands'][trigger]): if self.commandExists(command, trigger): try: - self.env['runtime']['debug'].writeDebugOut("Executing trigger.command:" + trigger + "." + command ,debug.debugLevel.INFO) - self.env['commands'][trigger][command].run() + if self.env['commandsIgnore'][trigger][command[command.find('-')+1:]+'_IGNORE']: + self.env['commandsIgnore'][trigger][command[command.find('-')+1:]+'_IGNORE'] = False + self.env['runtime']['debug'].writeDebugOut("Ignore trigger.command:" + trigger + "." + command ,debug.debugLevel.INFO) + else: + self.env['runtime']['debug'].writeDebugOut("Executing trigger.command:" + trigger + "." + command ,debug.debugLevel.INFO) + self.env['commands'][trigger][command].run() except Exception as e: self.env['runtime']['debug'].writeDebugOut("Executing trigger:" + trigger + "." + command ,debug.debugLevel.ERROR) self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) diff --git a/src/fenrir/core/commands.py b/src/fenrir/core/commands.py index 3e8ead6a..df5f1e50 100644 --- a/src/fenrir/core/commands.py +++ b/src/fenrir/core/commands.py @@ -43,3 +43,19 @@ commands = { 'onSwitchApplicationProfile':{ }, } + +# used by the commandManager +commandsIgnore = { +'onInput':{ + }, +'onScreenChanged':{ + }, +'onScreenUpdate':{ + }, +'onApplicationChange':{ + }, +'commands':{ + }, +'onSwitchApplicationProfile':{ + }, +} diff --git a/src/fenrir/core/environment.py b/src/fenrir/core/environment.py index ba768a91..6d66dc85 100644 --- a/src/fenrir/core/environment.py +++ b/src/fenrir/core/environment.py @@ -18,6 +18,7 @@ environment = { 'generalInformation': generalInformation.generalInformation, 'settings': settings.settings, 'commands': commands.commands, +'commandsIgnore': commands.commandsIgnore, 'commandInfo': commands.commandInfo, 'commandBuffer': commands.commandBuffer, 'input': inputEvent.input,