From 6b84a8e9bc9151f1853f4aa304801af2b1d51ca6 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 23 Apr 2025 01:36:03 -0400 Subject: [PATCH] Rename suspendingScreen to ignoreScreen. Requires edit to your settings file, find suspending and change it to ignore. This may break stuff, please let me know. --- config/settings/settings.conf | 4 ++-- src/fenrirscreenreader/core/commandManager.py | 6 +++--- src/fenrirscreenreader/core/fenrirManager.py | 2 +- src/fenrirscreenreader/core/screenManager.py | 12 ++++++------ src/fenrirscreenreader/core/settingsData.py | 4 ++-- src/fenrirscreenreader/fenrirVersion.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 7853dec6..d65bdf3a 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -92,8 +92,8 @@ fenrirMaxRate=450 driver=vcsaDriver encoding=auto screenUpdateDelay=0.05 -suspendingScreen= -autodetectSuspendingScreen=True +ignoreScreen= +autodetectIgnoreScreen=True [keyboard] driver=evdevDriver diff --git a/src/fenrirscreenreader/core/commandManager.py b/src/fenrirscreenreader/core/commandManager.py index f64f3d3a..f126cb19 100644 --- a/src/fenrirscreenreader/core/commandManager.py +++ b/src/fenrirscreenreader/core/commandManager.py @@ -176,7 +176,7 @@ class commandManager(): continue def executeSwitchTrigger(self, trigger, unLoadScript, loadScript): - if self.env['runtime']['screenManager'].isSuspendingScreen(): + if self.env['runtime']['screenManager'].isIgnoredScreen(): return #unload oldScript = unLoadScript @@ -199,7 +199,7 @@ class commandManager(): def executeDefaultTrigger(self, trigger, force=False): if not force: - if self.env['runtime']['screenManager'].isSuspendingScreen(): + if self.env['runtime']['screenManager'].isIgnoredScreen(): return for command in sorted(self.env['commands'][trigger]): if self.commandExists(command, trigger): @@ -214,7 +214,7 @@ class commandManager(): self.env['runtime']['debug'].writeDebugOut("Executing trigger:" + trigger + "." + command + str(e) ,debug.debugLevel.ERROR) def executeCommand(self, command, section = 'commands'): - if self.env['runtime']['screenManager'].isSuspendingScreen(): + if self.env['runtime']['screenManager'].isIgnoredScreen(): return if self.commandExists(command, section): try: diff --git a/src/fenrirscreenreader/core/fenrirManager.py b/src/fenrirscreenreader/core/fenrirManager.py index fedbe4ba..cd0131cf 100644 --- a/src/fenrirscreenreader/core/fenrirManager.py +++ b/src/fenrirscreenreader/core/fenrirManager.py @@ -55,7 +55,7 @@ class fenrirManager(): if self.environment['runtime']['inputManager'].noKeyPressed(): self.environment['runtime']['inputManager'].clearLastDeepInput() - if self.environment['runtime']['screenManager'].isSuspendingScreen(): + if self.environment['runtime']['screenManager'].isIgnoredScreen(): self.environment['runtime']['inputManager'].writeEventBuffer() else: if self.environment['runtime']['helpManager'].isTutorialMode(): diff --git a/src/fenrirscreenreader/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py index 13203162..3f7afe98 100644 --- a/src/fenrirscreenreader/core/screenManager.py +++ b/src/fenrirscreenreader/core/screenManager.py @@ -59,7 +59,7 @@ class screenManager(): if self.isCurrScreenIgnoredChanged(): self.env['runtime']['inputManager'].setExecuteDeviceGrab() self.env['runtime']['inputManager'].handleDeviceGrab() - if not self.isSuspendingScreen(self.env['screen']['newTTY']): + if not self.isIgnoredScreen(self.env['screen']['newTTY']): self.update(eventData, 'onScreenChange') self.env['screen']['lastScreenUpdate'] = time.time() else: @@ -81,7 +81,7 @@ class screenManager(): return self.prevScreenIgnored def updateScreenIgnored(self): self.prevScreenIgnored = self.currScreenIgnored - self.currScreenIgnored = self.isSuspendingScreen(self.env['screen']['newTTY']) + self.currScreenIgnored = self.isIgnoredScreen(self.env['screen']['newTTY']) def update(self, eventData, trigger='onUpdate'): # set new "old" values self.env['screen']['oldContentBytes'] = self.env['screen']['newContentBytes'] @@ -174,16 +174,16 @@ class screenManager(): except Exception as e: self.env['runtime']['debug'].writeDebugOut('screenManager:update:highlight: ' + str(e),debug.debugLevel.ERROR) - def isSuspendingScreen(self, screen = None): + def isIgnoredScreen(self, screen = None): if screen == None: screen = self.env['screen']['newTTY'] ignoreScreens = [] - fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen') + fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'ignoreScreen') if fixIgnoreScreens != '': ignoreScreens.extend(fixIgnoreScreens.split(',')) - if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'): + if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectIgnoreScreen'): ignoreScreens.extend(self.env['screen']['autoIgnoreScreens']) - self.env['runtime']['debug'].writeDebugOut('screenManager:isSuspendingScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO) + self.env['runtime']['debug'].writeDebugOut('screenManager:isIgnoredScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO) return (screen in ignoreScreens) def isScreenChange(self): diff --git a/src/fenrirscreenreader/core/settingsData.py b/src/fenrirscreenreader/core/settingsData.py index 15f9c702..d5c681e8 100644 --- a/src/fenrirscreenreader/core/settingsData.py +++ b/src/fenrirscreenreader/core/settingsData.py @@ -40,8 +40,8 @@ settingsData = { 'driver': 'vcsaDriver', 'encoding': 'auto', 'screenUpdateDelay': 0.1, - 'suspendingScreen': '', - 'autodetectSuspendingScreen': False, + 'ignoreScreen': '', + 'autodetectIgnoreScreen': False, }, 'general':{ 'debugLevel': debug.debugLevel.DEACTIVE, diff --git a/src/fenrirscreenreader/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py index e498b246..06cda4e3 100644 --- a/src/fenrirscreenreader/fenrirVersion.py +++ b/src/fenrirscreenreader/fenrirVersion.py @@ -4,5 +4,5 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -version = "2025.04.21" +version = "2025.04.23" codeName = "testing"