Author: dmeyer
Date: Mon Jan 29 21:06:06 2007
New Revision: 9086
Added:
trunk/ui/src/input/plugins/interface.py
- copied, changed from r9083, /trunk/ui/src/input/interface.py
Removed:
trunk/ui/src/input/interface.py
Modified:
trunk/ui/src/input/__init__.py
trunk/ui/src/input/plugins/dfbevents.py
trunk/ui/src/input/plugins/event_device.py
trunk/ui/src/input/plugins/joystick.py
trunk/ui/src/input/plugins/lirc.py
trunk/ui/src/input/plugins/sdl.py
trunk/ui/src/input/plugins/x11.py
Log:
remove recursive import between config and input
Modified: trunk/ui/src/input/__init__.py
==============================================================================
--- trunk/ui/src/input/__init__.py (original)
+++ trunk/ui/src/input/__init__.py Mon Jan 29 21:06:06 2007
@@ -10,4 +10,19 @@
from keymap import KEYBOARD_MAP, REMOTE_MAP, DIRECTFB_MAP
from eventmap import EVENTMAP
-from interface import set_mapping, get_mapping, InputPlugin
+# set key mapping for input
+_mapping = None
+
+def set_mapping(mapping):
+ """
+ Set new key mapping.
+ """
+ global _mapping
+ _mapping = mapping
+
+
+def get_mapping():
+ """
+ Get current key mapping.
+ """
+ return _mapping
Modified: trunk/ui/src/input/plugins/dfbevents.py
==============================================================================
--- trunk/ui/src/input/plugins/dfbevents.py (original)
+++ trunk/ui/src/input/plugins/dfbevents.py Mon Jan 29 21:06:06 2007
@@ -44,7 +44,7 @@
import config
import gui.displays
from freevo.ui.event import *
-from input.interface import InputPlugin
+from interface import InputPlugin
log = logging.getLogger('input')
Modified: trunk/ui/src/input/plugins/event_device.py
==============================================================================
--- trunk/ui/src/input/plugins/event_device.py (original)
+++ trunk/ui/src/input/plugins/event_device.py Mon Jan 29 21:06:06 2007
@@ -93,7 +93,7 @@
import input.linux_input as li
import input.evdev_keymaps as ek
-from input.interface import InputPlugin
+from interface import InputPlugin
from freevo.ui.event import *
Copied: trunk/ui/src/input/plugins/interface.py (from r9083,
/trunk/ui/src/input/interface.py)
==============================================================================
--- /trunk/ui/src/input/interface.py (original)
+++ trunk/ui/src/input/plugins/interface.py Mon Jan 29 21:06:06 2007
@@ -29,38 +29,20 @@
#
# -----------------------------------------------------------------------------
-__all__ = [ 'set_mapping', 'get_mapping', 'InputPlugin' ]
+__all__ = [ 'InputPlugin' ]
# python imports
-import copy
import logging
# freevo imports
import config
+import input
from freevo.ui import plugin
# get logging object
log = logging.getLogger('input')
-# set key mapping for input
-_mapping = None
-
-def set_mapping(mapping):
- """
- Set new key mapping.
- """
- global _mapping
- _mapping = mapping
-
-
-def get_mapping():
- """
- Get current key mapping.
- """
- return _mapping
-
-
class InputPlugin(plugin.Plugin):
"""
Plugin for input devices such as keyboard and lirc. A plugin of this
@@ -74,7 +56,7 @@
if not key:
return None
- for c in (_mapping, 'global'):
+ for c in (input.get_mapping(), 'global'):
if not config.EVENTS.has_key(c):
continue
if not config.EVENTS[c].has_key(key):
@@ -82,4 +64,4 @@
return config.EVENTS[c][key].post()
- log.warning('no event mapping for key %s in %s' % (key, _mapping))
+ log.warning('no event mapping for key %s in %s' % (key,
input.get_mapping()))
Modified: trunk/ui/src/input/plugins/joystick.py
==============================================================================
--- trunk/ui/src/input/plugins/joystick.py (original)
+++ trunk/ui/src/input/plugins/joystick.py Mon Jan 29 21:06:06 2007
@@ -40,7 +40,7 @@
from time import sleep
import config
-from input.interface import InputPlugin
+from interface import InputPlugin
import logging
log = logging.getLogger('input')
Modified: trunk/ui/src/input/plugins/lirc.py
==============================================================================
--- trunk/ui/src/input/plugins/lirc.py (original)
+++ trunk/ui/src/input/plugins/lirc.py Mon Jan 29 21:06:06 2007
@@ -35,7 +35,7 @@
import kaa.input.lirc
import config
-from input.interface import InputPlugin
+from interface import InputPlugin
class PluginInterface(InputPlugin):
"""
Modified: trunk/ui/src/input/plugins/sdl.py
==============================================================================
--- trunk/ui/src/input/plugins/sdl.py (original)
+++ trunk/ui/src/input/plugins/sdl.py Mon Jan 29 21:06:06 2007
@@ -41,7 +41,7 @@
from menu import Item
from freevo.ui.event import *
-from input.interface import InputPlugin
+from interface import InputPlugin
# get logging object
log = logging.getLogger('input')
Modified: trunk/ui/src/input/plugins/x11.py
==============================================================================
--- trunk/ui/src/input/plugins/x11.py (original)
+++ trunk/ui/src/input/plugins/x11.py Mon Jan 29 21:06:06 2007
@@ -39,7 +39,7 @@
# input imports
from input import linux_input
-from input.interface import InputPlugin
+from interface import InputPlugin
# get logging object
log = logging.getLogger('input')
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
