X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5274c69abf4cb2b99ab9d92ac0081c0ec49bd2e4..22d418a23b2792bb89fe6974fe24b01aba126a56:/lib/python/Screens/Screen.py diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py index 4c4f117b..4a0accda 100644 --- a/lib/python/Screens/Screen.py +++ b/lib/python/Screens/Screen.py @@ -1,4 +1,4 @@ -from Tools.Profile import profile, profile_final +from Tools.Profile import profile profile("LOAD:GUISkin") from Components.GUISkin import GUISkin @@ -6,14 +6,18 @@ profile("LOAD:Source") from Components.Sources.Source import Source profile("LOAD:GUIComponent") from Components.GUIComponent import GUIComponent +profile("LOAD:eRCInput") +from enigma import eRCInput class Screen(dict, GUISkin): + False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3) ALLOW_SUSPEND = False global_screen = None def __init__(self, session, parent = None): + dict.__init__(self) self.skinName = self.__class__.__name__ self.session = session self.parent = parent @@ -44,6 +48,24 @@ class Screen(dict, GUISkin): # stand alone screens (for example web screens) # don't care about having or not having focus. self.stand_alone = False + self.keyboardMode = None + + def saveKeyboardMode(self): + rcinput = eRCInput.getInstance() + self.keyboardMode = rcinput.getKeyboardMode() + + def setKeyboardModeAscii(self): + rcinput = eRCInput.getInstance() + rcinput.setKeyboardMode(rcinput.kmAscii) + + def setKeyboardModeNone(self): + rcinput = eRCInput.getInstance() + rcinput.setKeyboardMode(rcinput.kmNone) + + def restoreKeyboardMode(self): + rcinput = eRCInput.getInstance() + if self.keyboardMode is not None: + rcinput.setKeyboardMode(self.keyboardMode) def execBegin(self): self.active_components = [ ] @@ -75,10 +97,11 @@ class Screen(dict, GUISkin): x() def execEnd(self): + active_components = self.active_components # for (name, val) in self.items(): - for val in self.active_components: + self.active_components = None + for val in active_components: val.execEnd() - del self.active_components # assert self.session != None, "execEnd on non-execing screen!" # self.session = None self.execing = False @@ -98,18 +121,15 @@ class Screen(dict, GUISkin): # but currently we destroy the screen afterwards # anyway. for val in self.renderer: - val.disconnectAll() # disconnected converter/sources and probably destroy them - + val.disconnectAll() # disconnected converter/sources and probably destroy them. Sources will not be destroyed. + del self.session for (name, val) in self.items(): val.destroy() del self[name] - - for val in self.renderer: - val.destroy() - + self.renderer = [ ] - + # really delete all elements now self.__dict__.clear()