X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fe3e42f417c8c735bdfd6f57799a2247477a0fda..2e90ba76e9e70689b9821c7daaf2110550e05520:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 2fa539b8..804af795 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -17,25 +17,28 @@
 		<key id="2" mapto="moveDown" flags="mr" />
 	</map>
 	
-	<map context="InputActions">
+	<map context="KeyboardInputActions">
 		<key id="KEY_LEFT" mapto="moveLeft" flags="mr" />
 		<key id="KEY_RIGHT" mapto="moveRight" flags="mr" />
 		<key id="KEY_HOME" mapto="moveHome" flags="mr" />
 		<key id="KEY_END" mapto="moveEnd" flags="mr" />
 		<key id="KEY_DELETE" mapto="deleteForward" flags="mr" />
 		<key id="KEY_BACKSPACE" mapto="deleteBackward" flags="mr" />
-		
+		<key id="KEY_TAB" mapto="tab" flags="mr" />
 		<key id="KEY_INSERT" mapto="toggleOverwrite" flags="m" />
 		<key id="KEY_ENTER" mapto="accept" flags="m" />
 	</map>
 
 	<map context="SetupActions">
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_RED" mapto="cancel" flags="m" />
 		<key id="KEY_GREEN" mapto="save" flags="m" />
+		<key id="KEY_MUTE" mapto="delete" flags="mr" />
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
 		<key id="KEY_3" mapto="3" flags="m" />
@@ -68,9 +71,18 @@
 	</map>
 	
 	<map context="InfobarInstantRecord">
-		<key id="KEY_RED" mapto="instantRecord" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_RED" mapto="instantRecord" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
+		</device>
 	</map>
 
+	<map context="InfobarExtensions">
+		<key id="KEY_BLUE" mapto="extensions" flags="m" />
+	</map>
+	
 	<map context="InfobarChannelSelection">
 		<key id="KEY_LEFT" mapto="zapUp" flags="mr" />
 		<key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
@@ -78,6 +90,8 @@
 		<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
 		<key id="KEY_PREVIOUS" mapto="historyBack" flags="mr" />
 		<key id="KEY_NEXT" mapto="historyNext" flags="mr" />
+		<key id="KEY_CHANNELUP" mapto="openServiceList" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="openServiceList" flags="m" />
 		<key id="BTN_0" mapto="zapUp" flags="mr" />
 		<key id="BTN_1" mapto="zapDown" flags="mr" />
 	</map>
@@ -85,15 +99,23 @@
 	<map context="MinuteInputActions">
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
-		<key id="KEY_OK" mapto="ok" flags="mr" />
-		<key id="KEY_EXIT" mapto="cancel" flags="mr" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
+	</map>
+
+	<map context="InputAsciiActions">
+		<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
 	</map>
 
 	<map context="InputBoxActions">
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="back" flags="m" />
+		<key id="KEY_ESC" mapto="back" flags="m" />
 		<key id="KEY_MUTE" mapto="delete" flags="mr" />
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
@@ -113,7 +135,9 @@
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="back" flags="m" />
+		<key id="KEY_ESC" mapto="back" flags="m" />
 	</map>
 	
 	<map context="InfobarMenuActions">
@@ -126,22 +150,37 @@
 	
 	<map context="InfobarShowHideActions">
 		<key id="KEY_OK" mapto="toggleShow" flags="m" />
+		<key id="KEY_ENTER" mapto="toggleShow" flags="m" />
 		<key id="KEY_EXIT" mapto="hide" flags="m" />
+		<key id="KEY_ESC" mapto="hide" flags="m" />
 	</map>
 
 	<map context="InfobarActions">
 		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
 		<key id="KEY_RADIO" mapto="showRadio" flags="m" />
+		<key id="KEY_TV" mapto="showTv" flags="m" />
 	</map>
 
 	<map context="InfobarAudioSelectionActions">
-		<key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_YELLOW" mapto="audioSelection" flags="m" />
+		</device>
 	</map>
 
 	<map context="InfobarSubserviceSelectionActions">
 		<key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
 	</map>
 
+	<map context="InfobarSubserviceQuickzapActions">
+		<key id="KEY_PREVIOUS" mapto="prevSubservice" flags="m" />
+		<key id="KEY_NEXT" mapto="nextSubservice" flags="m" />
+		<key id="KEY_EXIT" mapto="exit" flags="m" />
+		<key id="KEY_TV" mapto="exit" flags="m" />
+	</map>
+
 	<map context="GlobalActions">
 		<key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
 		<key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
@@ -173,15 +212,25 @@
 	</map>	
 
 	<map context="InfobarSeekActions">
-		<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
-		<key id="KEY_GREEN" mapto="unPauseService" flags="m" />
-		<key id="KEY_RED" mapto="seekBackDown" flags="m" />
-		<key id="KEY_RED" mapto="seekBackUp" flags="b" />
-		<key id="KEY_BLUE" mapto="seekFwdDown" flags="m" />
-		<key id="KEY_BLUE" mapto="seekFwdUp" flags="b" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
+			<key id="KEY_GREEN" mapto="unPauseService" flags="m" />
+			<key id="KEY_RED" mapto="seekBackDown" flags="m" />
+			<key id="KEY_RED" mapto="seekBackUp" flags="b" />
+			<key id="KEY_BLUE" mapto="seekFwdDown" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_PLAY" mapto="pauseService" flags="m" />
+			<!--key id="KEY_GREEN" mapto="unPauseService" flags="m" /-->
+			<key id="KEY_PREVIOUSSONG" mapto="seekBackDown" flags="m" />
+			<key id="KEY_PREVIOUSSONG" mapto="seekBackUp" flags="b" />
+			<key id="KEY_NEXTSONG" mapto="seekFwdDown" flags="m" />
+		</device>
 		
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
 		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
+
+		<key id="KEY_OK" mapto="unPauseService" flags="m" />
 		
 		<key id="KEY_1" mapto="seek:-30" flags="m" />
 		<key id="KEY_3" mapto="seek:30" flags="m" />
@@ -192,17 +241,30 @@
 	</map>
 
 	<map context="InfobarTimeshiftActions">
-		<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
-		<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
+			<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_PLAY" mapto="timeshiftStart" flags="m" />
+			<key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
+		</device>
 	</map>
 
 	<map context="InfobarTimeshiftActivateActions">
-		<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
-		<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
+			<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" />
+			<key id="KEY_PLAY" mapto="timeshiftActivateEndAndPause" flags="m" />
+		</device>
 	</map>
 
 	<map context="MovieSelectionActions">
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
 	</map>
 
 	<map context="InfobarMovieListActions">
@@ -212,13 +274,23 @@
 	</map>
 
 	<map context="MoviePlayerActions">
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_STOP" mapto="leavePlayer" flags="m" />
+		</device>
 		<key id="KEY_TV" mapto="leavePlayer" flags="m" />
 	</map>
 	
 	<map context="InfobarCueSheetActions">
-		<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
-		<key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
-		<key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
+			<key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
+			<key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
+			<key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
+			<key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
+		</device>
 	</map>
 	
 	<map context="InfobarTeletextActions">
@@ -232,6 +304,8 @@
 		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
 		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
 		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+		<key id="KEY_PREVIOUS" mapto="prevMarker" flags="m" />
+		<key id="KEY_NEXT" mapto="nextMarker" flags="m" />
 	</map>
 
 	<map context="ChannelSelectEPGActions">
@@ -255,7 +329,11 @@
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
 		<key id="KEY_YELLOW" mapto="yellow" flags="mr" />
 		<key id="KEY_BLUE" mapto="blue" flags="mr" />
+		<key id="KEY_RED" mapto="red" flags="m" />
 		<key id="KEY_INFO" mapto="info" flags="m" />
+		<key id="KEY_MENU" mapto="input_date_time" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
 	</map>
 
 	<map context="EventViewActions">
@@ -263,6 +341,7 @@
 		<key id="KEY_DOWN" mapto="pageDown" flags="mr" />
 		<key id="KEY_LEFT" mapto="prevEvent" flags="mr" />
 		<key id="KEY_RIGHT" mapto="nextEvent" flags="mr" />
+		<key id="KEY_RED" mapto="openSimilarList" flags="m" />
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
 		<key id="KEY_INFO" mapto="cancel" flags="m" />
 	</map>
@@ -277,10 +356,9 @@
 		<key id="\x1b" mapto="cancel" flags="m" />
 
 		<!-- use this on rcu, ok? -->
-		<key id="KEY_OK" mapto="ok" flags="m" />		
+		<key id="KEY_OK" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
 
-
 		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
@@ -303,17 +381,19 @@
 	</map>
 	
 	<map context="ColorActions">
-		<key id="KEY_RED" mapto="red" flags="m" />		
+		<key id="KEY_RED" mapto="red" flags="m" />
 		<key id="KEY_GREEN" mapto="green" flags="m" />
-		<key id="KEY_YELLOW" mapto="yellow" flags="m" />		
+		<key id="KEY_YELLOW" mapto="yellow" flags="m" />
 		<key id="KEY_BLUE" mapto="blue" flags="m" />
 	</map>
 
 	<map context="MsgBoxActions">
 		<key id="KEY_GREEN" mapto="alwaysOK" flags="m" />
-		<key id="KEY_OK" mapto="ok" flags="m" />		
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_RED" mapto="cancel" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
 
 	<map context="WindowActions">
@@ -338,6 +418,28 @@
 	<map context="StandbyActions">
 		<key id="KEY_POWER" mapto="power" flags="m" />
 	</map>
+	
+	<map context="SleepTimerEditorActions">
+		<key id="KEY_OK" mapto="select" flags="m" />
+		<key id="KEY_EXIT" mapto="exit" flags="m" />
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
+		<key id="KEY_LEFT" mapto="selectLeft" flags="mr" />
+		<key id="KEY_RIGHT" mapto="selectRight" flags="mr" />
+		<key id="KEY_RED" mapto="disableTimer" flags="mr" />
+		<key id="KEY_YELLOW" mapto="toggleAsk" flags="mr" />
+		<key id="KEY_GREEN" mapto="toggleAction" flags="mr" />
+		<!--key id="KEY_BLUE" mapto="settings" flags="mr" /-->
+		
+	</map>	
 	<map context="CutListEditorActions">
 		<key id="KEY_NEXT" mapto="setIn" flags="m" />
 		<key id="KEY_PREVIOUS" mapto="setOut" flags="m" />
@@ -345,12 +447,40 @@
 		<key id="KEY_CHANNELUP" mapto="addMark" flags="m" />
 		<key id="KEY_CHANNELDOWN" mapto="removeMark" flags="m" />
 		<key id="KEY_EXIT" mapto="leave" flags="m" />
+		<key id="KEY_ESC" mapto="leave" flags="m" />
 		<key id="KEY_OK" mapto="showMenu" flags="m" />
+		<key id="KEY_ENTER" mapto="showMenu" flags="m" />
+	</map>
+	
+	<map context="CiSelectionActions">
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+	</map>
+
+	<map context="PiPSetupActions">
+		<key id="KEY_UP" mapto="up" flags="mr" />
+		<key id="KEY_DOWN" mapto="down" flags="mr" />
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="size+" flags="mr" />
+		<key id="KEY_CHANNELDOWN" mapto="size-" flags="mr" />
 	</map>
 	
 	<map context="MediaPlayerSeekActions">
-		<key id="KEY_YELLOW" mapto="pause" flags="m" />
-		<key id="KEY_GREEN" mapto="play" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_YELLOW" mapto="pause" flags="m" />
+			<key id="KEY_GREEN" mapto="play" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
+			<key id="KEY_STOP" mapto="stop" flags="m" />
+			<!--key id="KEY_GREEN" mapto="play" flags="m" /-->
+		</device>
+		
 		<key id="KEY_TV" mapto="stop" flags="m" />
 
 		<key id="KEY_PREVIOUS" mapto="previous" flags="mr" />