Author: dmeyer
Date: Fri Dec 7 15:16:29 2007
New Revision: 10185
Log:
code cleanup
Removed:
trunk/ui/src/input/evdev_keymaps.py
trunk/ui/src/input/linux_input.py
Modified:
trunk/ui/src/input/__init__.py
trunk/ui/src/input/keymap.py
trunk/ui/src/input/plugins/interface.py
trunk/ui/src/input/plugins/sdl.py
trunk/ui/src/input/plugins/x11.py
Modified: trunk/ui/src/input/__init__.py
==============================================================================
--- trunk/ui/src/input/__init__.py (original)
+++ trunk/ui/src/input/__init__.py Fri Dec 7 15:16:29 2007
@@ -37,5 +37,5 @@
#
# -----------------------------------------------------------------------------
-from keymap import KEYBOARD_MAP, REMOTE_MAP, DIRECTFB_MAP
+from keymap import KEYBOARD_MAP
from eventmap import EVENTMAP
Modified: trunk/ui/src/input/keymap.py
==============================================================================
--- trunk/ui/src/input/keymap.py (original)
+++ trunk/ui/src/input/keymap.py Fri Dec 7 15:16:29 2007
@@ -1,5 +1,3 @@
-
-
KEYBOARD_MAP = {
'F1' : 'SLEEP',
'HOME' : 'MENU',
@@ -48,315 +46,3 @@
'A' : 'LANG',
'T' : 'TOGGLE'
}
-
-REMOTE_MAP = {
- 'HOME' : 'MENU',
- 'ESCAPE' : 'EXIT',
- 'UP' : 'UP',
- 'DOWN' : 'DOWN',
- 'LEFT' : 'LEFT',
- 'RIGHT' : 'RIGHT',
- 'SPACE' : 'SELECT',
- 'RETURN' : 'SELECT',
- '1' : '1',
- '2' : '2',
- '3' : '3',
- '4' : '4',
- '5' : '5',
- '6' : '6',
- '7' : '7',
- '8' : '8',
- '9' : '9',
- '0' : '0',
- 'SLEEP' : 'SLEEP',
- 'MENU' : 'MENU',
- 'EPG' : 'GUIDE',
- 'INFO' : 'INFO',
- 'EXIT' : 'EXIT',
- 'SELECT' : 'SELECT',
- 'OK' : 'SELECT',
- 'POWER' : 'POWER',
- 'MUTE' : 'MUTE',
- 'VOLUMEUP' : 'VOL+',
- 'VOLUMEDOWN' : 'VOL-',
- 'CHANNELUP' : 'CH+',
- 'CHANNELDOWN' : 'CH-',
- 'SCREEN' : 'DISPLAY',
- 'ENTER' : 'ENTER',
- 'PREVIOUS' : 'PREV_CH',
- 'VIDEO' : 'TV_VCR',
- 'REWIND' : 'REW',
- 'PLAY' : 'PLAY',
- 'FASTFORWARD' : 'FFWD',
- 'PAUSE' : 'PAUSE',
- 'STOP' : 'STOP',
- 'RECORD' : 'REC',
- 'EJECTCD' : 'EJECT',
- 'SUBTITLE' : 'SUBTITLE',
- 'LANGUAGE' : 'LANG'
-}
-
-
-# TODO: eventually move this into config() of input.dfbevents plugin
-# waiting until we do further work on config module and plugin
-# configs.
-# NOTE: These represent all of the DirectFB Key Symbols which may be found at:
-#
http://www.directfb.org/docs/DirectFB_Reference/types.html#DFBInputDeviceKeySymbol
-#
-DIRECTFB_MAP = {
- 'BACKSPACE' : 'EXIT',
- 'TAB' : 'PIP_ONOFF',
- 'RETURN' : 'SELECT',
- 'CANCEL' : 'EXIT',
- 'ESCAPE' : 'EXIT',
- 'SPACE' : 'ENTER',
- 'EXCLAMATION_MARK' : None,
- 'QUOTATION' : None,
- 'NUMBER_SIGN' : None,
- 'DOLLAR_SIGN' : None,
- 'PERCENT_SIGN' : None,
- 'AMPERSAND' : None,
- 'APOSTROPHE' : None,
- 'PARENTHESIS_LEFT' : None,
- 'PARENTHESIS_RIGHT' : None,
- 'ASTERISK' : None,
- 'PLUS_SIGN' : 'VOL+',
- 'COMMA' : None,
- 'MINUS_SIGN' : 'VOL-',
- 'PERIOD' : None,
- 'SLASH' : None,
- '0' : '0',
- '1' : '1',
- '2' : '2',
- '3' : '3',
- '4' : '4',
- '5' : '5',
- '6' : '6',
- '7' : '7',
- '8' : '8',
- '9' : '9',
- 'COLON' : None,
- 'SEMICOLON' : None,
- 'LESS_THAN_SIGN' : None,
- 'EQUALS_SIGN' : None,
- 'GREATER_THAN_SIGN' : None,
- 'QUESTION_MARK' : None,
- 'AT' : None,
- 'CAPITAL_A' : 'LANG',
- 'CAPITAL_B' : None,
- 'CAPITAL_C' : 'CH+',
- 'CAPITAL_D' : 'DISPLAY',
- 'CAPITAL_E' : 'ENTER',
- 'CAPITAL_F' : 'FFWD',
- 'CAPITAL_G' : 'GUIDE',
- 'CAPITAL_H' : None,
- 'CAPITAL_I' : 'PIP_MOVE',
- 'CAPITAL_J' : None,
- 'CAPITAL_K' : None,
- 'CAPITAL_L' : 'SUBTITLE',
- 'CAPITAL_M' : 'VOL+',
- 'CAPITAL_N' : 'VOL-',
- 'CAPITAL_O' : 'PIP_ONOFF',
- 'CAPITAL_P' : 'PLAY',
- 'CAPITAL_Q' : None,
- 'CAPITAL_R' : 'REW',
- 'CAPITAL_S' : 'STOP',
- 'CAPITAL_T' : None,
- 'CAPITAL_U' : 'PAUSE',
- 'CAPITAL_V' : 'CH-',
- 'CAPITAL_W' : 'PIP_SWAP',
- 'CAPITAL_X' : None,
- 'CAPITAL_Y' : None,
- 'CAPITAL_Z' : 'HELP',
- 'SQUARE_BRACKET_LEFT' : None,
- 'BACKSLASH' : None,
- 'SQUARE_BRACKET_RIGHT' : None,
- 'CIRCUMFLEX_ACCENT' : None,
- 'UNDERSCORE' : None,
- 'GRAVE_ACCENT' : None,
- 'SMALL_A' : 'LANG',
- 'SMALL_B' : None,
- 'SMALL_C' : 'CH+',
- 'SMALL_D' : 'DISPLAY',
- 'SMALL_E' : 'ENTER',
- 'SMALL_F' : 'FFWD',
- 'SMALL_G' : 'GUIDE',
- 'SMALL_H' : None,
- 'SMALL_I' : 'PIP_MOVE',
- 'SMALL_J' : None,
- 'SMALL_K' : None,
- 'SMALL_L' : 'SUBTITLE',
- 'SMALL_M' : 'VOL+',
- 'SMALL_N' : 'VOL-',
- 'SMALL_O' : 'PIP_ONOFF',
- 'SMALL_P' : 'PLAY',
- 'SMALL_Q' : None,
- 'SMALL_R' : 'REW',
- 'SMALL_S' : 'STOP',
- 'SMALL_T' : None,
- 'SMALL_U' : 'PAUSE',
- 'SMALL_V' : 'CH-',
- 'SMALL_W' : 'PIP_SWAP',
- 'SMALL_X' : None,
- 'SMALL_Y' : None,
- 'SMALL_Z' : 'HELP',
- 'CURLY_BRACKET_LEFT' : None,
- 'VERTICAL_BAR' : None,
- 'CURLY_BRACKET_RIGHT' : None,
- 'TILDE' : None,
- 'DELETE' : None,
- 'ENTER' : 'SELECT',
- 'CURSOR_LEFT' : 'LEFT',
- 'CURSOR_RIGHT' : 'RIGHT',
- 'CURSOR_UP' : 'UP',
- 'CURSOR_DOWN' : 'DOWN',
- 'INSERT' : None,
- 'HOME' : 'MENU',
- 'END' : None,
- 'PAGE_UP' : 'PAGE_UP',
- 'PAGE_DOWN' : 'PAGE_DOWN',
- 'PRINT' : None,
- 'PAUSE' : 'PAUSE',
- 'OK' : 'SELECT',
- 'SELECT' : 'SELECT',
- 'GOTO' : 'SELECT',
- 'CLEAR' : None,
- 'POWER' : 'POWER',
- 'POWER2' : 'POWER',
- 'OPTION' : None,
- 'MENU' : 'MENU',
- 'HELP' : 'HELP',
- 'INFO' : 'INFO',
- 'TIME' : None,
- 'VENDOR' : None,
- 'ARCHIVE' : None,
- 'PROGRAM' : None,
- 'CHANNEL' : None,
- 'FAVORITES' : None,
- 'EPG' : None,
- 'PVR' : None,
- 'MHP' : None,
- 'LANGUAGE' : 'LANG',
- 'TITLE' : None,
- 'SUBTITLE' : 'SUBTITLE',
- 'ANGLE' : 'ANGLE',
- 'ZOOM' : 'ZOOM',
- 'MODE' : 'TV_VCR',
- 'KEYBOARD' : None,
- 'PC' : None,
- 'SCREEN' : None,
- 'TV' : None,
- 'TV2' : None,
- 'VCR' : None,
- 'VCR2' : None,
- 'SAT' : None,
- 'SAT2' : None,
- 'CD' : None,
- 'TAPE' : None,
- 'RADIO' : None,
- 'TUNER' : None,
- 'PLAYER' : None,
- 'TEXT' : None,
- 'DVD' : None,
- 'AUX' : None,
- 'MP3' : None,
- 'PHONE' : None,
- 'AUDIO' : None,
- 'VIDEO' : None,
- 'INTERNET' : None,
- 'MAIL' : None,
- 'NEWS' : None,
- 'DIRECTORY' : None,
- 'LIST' : None,
- 'CALCULATOR' : None,
- 'MEMO' : None,
- 'CALENDAR' : None,
- 'EDITOR' : None,
- 'RED' : 'RED',
- 'GREEN' : 'GREEN',
- 'YELLOW' : 'YELLOW',
- 'BLUE' : 'BLUE',
- 'CHANNEL_UP' : 'CH+',
- 'CHANNEL_DOWN' : 'CH-',
- 'BACK' : 'REW',
- 'FORWARD' : 'FFWD',
- 'FIRST' : 'PAGE_UP',
- 'LAST' : 'PAGE_DOWN',
- 'VOLUME_UP' : 'VOL+',
- 'VOLUME_DOWN' : 'VOL-',
- 'MUTE' : 'MUTE',
- 'AB' : None,
- 'PLAYPAUSE' : 'PLAY',
- 'PLAY' : 'PLAY',
- 'STOP' : 'STOP',
- 'RESTART' : None,
- 'SLOW' : None,
- 'FAST' : None,
- 'RECORD' : 'REC',
- 'EJECT' : 'EJECT',
- 'SHUFFLE' : None,
- 'REWIND' : 'REW',
- 'FASTFORWARD' : 'FFWD',
- 'PREVIOUS' : 'PAGE_UP',
- 'NEXT' : 'PAGE_DOWN',
- 'BEGIN' : None,
- 'DIGITS' : None,
- 'TEEN' : None,
- 'TWEN' : None,
- 'BREAK' : None,
- 'EXIT' : 'EXIT',
- 'SETUP' : None,
- 'CURSOR_LEFT_UP' : None,
- 'CURSOR_LEFT_DOWN' : None,
- 'CURSOR_UP_RIGHT' : None,
- 'CURSOR_DOWN_RIGHT' : None,
- 'F1' : 'SLEEP',
- 'F2' : 'POWER',
- 'F3' : 'MUTE',
- 'F4' : 'TV_VCR',
- 'F5' : None,
- 'F6' : 'REC',
- 'F7' : None,
- 'F8' : None,
- 'F9' : None,
- 'F10' : None,
- 'F11' : None,
- 'F12' : None,
- 'SHIFT' : None,
- 'CONTROL' : None,
- 'ALT' : None,
- 'ALTGR' : None,
- 'META' : None,
- 'SUPER' : None,
- 'HYPER' : None,
- 'CAPS_LOCK' : None,
- 'NUM_LOCK' : None,
- 'SCROLL_LOCK' : None,
- 'DEAD_ABOVEDOT' : None,
- 'DEAD_ABOVERING' : None,
- 'DEAD_ACUTE' : None,
- 'DEAD_BREVE' : None,
- 'DEAD_CARON' : None,
- 'DEAD_CEDILLA' : None,
- 'DEAD_CIRCUMFLEX' : None,
- 'DEAD_DIAERESIS' : None,
- 'DEAD_DOUBLEACUTE' : None,
- 'DEAD_GRAVE' : None,
- 'DEAD_IOTA' : None,
- 'DEAD_MACRON' : None,
- 'DEAD_OGONEK' : None,
- 'DEAD_SEMIVOICED_SOUND': None,
- 'DEAD_TILDE' : None,
- 'DEAD_VOICED_SOUND' : None,
- 'CUSTOM0' : None,
- 'CUSTOM1' : None,
- 'CUSTOM2' : None,
- 'CUSTOM3' : None,
- 'CUSTOM4' : None,
- 'CUSTOM5' : None,
- 'CUSTOM6' : None,
- 'CUSTOM7' : None,
- 'CUSTOM8' : None,
- 'CUSTOM9' : None
-}
-
Modified: trunk/ui/src/input/plugins/interface.py
==============================================================================
--- trunk/ui/src/input/plugins/interface.py (original)
+++ trunk/ui/src/input/plugins/interface.py Fri Dec 7 15:16:29 2007
@@ -6,12 +6,12 @@
#
# -----------------------------------------------------------------------------
# Freevo - A Home Theater PC framework
-# Copyright (C) 2002-2005 Krister Lagerstrom, Dirk Meyer, et al.
+# Copyright (C) 2002 Krister Lagerstrom, 2005-2007 Dirk Meyer, et al.
#
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -39,30 +39,22 @@
# freevo imports
from freevo import plugin
from freevo.ui import config
-from freevo.ui.input import EVENTMAP
+from freevo.ui.input import EVENTMAP as global_map
from freevo.ui.event import Event
-from freevo.ui.application import get_eventmap
+from freevo.ui.application import get_eventmap as current_app
# get logging object
log = logging.getLogger('input')
+# get config event map
+config_map = config.input.eventmap
+
class InputPlugin(plugin.Plugin):
"""
Plugin for input devices such as keyboard and lirc. A plugin of this
type should be in input/plugins
"""
- def plugin_activate(self, level):
- """
- Create eventmap on activate. FIXME: changing the setting during
- runtime has no effect.
- """
- self.eventmap = copy.deepcopy(EVENTMAP)
- for app, mapping in config.input.eventmap.items():
- for key, command in mapping.items():
- self.eventmap[app][key] = Event(*command.split(' '))
-
-
def post_key(self, key):
"""
Send a keyboard event to the event queue
@@ -70,12 +62,13 @@
if not key:
return None
- for c in (get_eventmap(), 'global'):
- if not self.eventmap.has_key(c):
- continue
- if not self.eventmap[c].has_key(key):
- continue
-
- return self.eventmap[c][key].post(event_source='user')
+ for app in (current_app(), 'global'):
+ # check config file event mapping
+ if app in config_map and key in config_map[app]:
+ event = Event(*config_map[app][key].split(' '))
+ return event.post(event_source='user')
+ # check global pre-defined event mapping
+ if app in global_map and key in global_map[app]:
+ return global_map[app][key].post(event_source='user')
- log.warning('no event mapping for key %s in %s' % (key,
get_eventmap()))
+ log.warning('no event mapping for key %s in %s' % (key, current_app()))
Modified: trunk/ui/src/input/plugins/sdl.py
==============================================================================
--- trunk/ui/src/input/plugins/sdl.py (original)
+++ trunk/ui/src/input/plugins/sdl.py Fri Dec 7 15:16:29 2007
@@ -52,8 +52,7 @@
def plugin_activate(self, level):
"""
- Create eventmap on activate. FIXME: changing the setting during
- runtime has no effect.
+ Active SDL input layer
"""
InputPlugin.plugin_activate(self, level)
# define the keymap
Modified: trunk/ui/src/input/plugins/x11.py
==============================================================================
--- trunk/ui/src/input/plugins/x11.py (original)
+++ trunk/ui/src/input/plugins/x11.py Fri Dec 7 15:16:29 2007
@@ -54,8 +54,7 @@
def plugin_activate(self, level):
"""
- Create eventmap on activate. FIXME: changing the setting during
- runtime has no effect.
+ Active X11 input layer
"""
InputPlugin.plugin_activate(self, level)
gui.get_display()._window.signals["key_press_event"].connect(self.handle)
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
