X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b..181d3463e3545890e0a0c60081e84af67d302614:/keymap.xml

diff --git a/keymap.xml b/keymap.xml
index a17aebbc..e4e51ea5 100644
--- a/keymap.xml
+++ b/keymap.xml
@@ -4,21 +4,72 @@
 			<key id="a" mapto="up" flags="mr" />
 			<key id="b" mapto="down" flags="mr" />
 		</device>
-		<key id="KEY_UP" mapto="up" flags="mr" />
-		<key id="KEY_DOWN" mapto="down" flags="mr" />
+		<key id="KEY_UP" mapto="moveUp" flags="mr" />
+		<key id="KEY_DOWN" mapto="moveDown" flags="mr" />
+		<key id="KEY_HOME" mapto="moveTop" flags="mr" />
+		<key id="KEY_END" mapto="moveEnd" flags="mr" />
+		<key id="KEY_PAGEUP" mapto="pageUp" flags="mr" />
+		<key id="KEY_PAGEDOWN" mapto="pageDown" flags="mr" />
 		<key id="1" mapto="moveUp" flags="mr" />
 		<key id="2" mapto="moveDown" flags="mr" />
 	</map>
+	
+	<map context="InputActions">
+		<key id="1" mapto="moveLeft" flags="mr" />
+		<key id="2" mapto="moveRight" flags="mr" />
+		<key id="3" mapto="moveHome" flags="mr" />
+		<key id="4" mapto="moveEnd" flags="mr" />
+		<key id="5" mapto="deleteChar" flags="mr" />
+		
+		<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" />
+	</map>
+
 	<map context="InfobarActions">
 		<key id="m" mapto="mainMenu" flags="mr" />
-		<key id="c" mapto="switchChannel" flags="mr" />
-	</map>
-	<map context="MainMenuActions">
-		<key id=" " mapto="selected" flags="mr" />
+		<key id="c" mapto="switchChannelDown" flags="mr" />
+		<key id="r" mapto="instantRecord" flags="m" />
+		<key id="1" mapto="zapUp" flags="mr" />
+		<key id="2" mapto="zapDown" flags="mr" />
+		<key id="KEY_M" mapto="mainMenu" flags="mr" />
+		<key id="KEY_C" mapto="switchChannelDown" flags="mr" />
+		<key id="KEY_R" mapto="instantRecord" flags="m" />
+		<key id="KEY_LEFT" mapto="zapUp" flags="mr" />
+		<key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
+		<key id="KEY_UP" mapto="switchChannelUp" flags="mr" />
+		<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
+		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
+		<key id="KEY_OK" mapto="toggleShow" flags="mr" />
+		<key id="KEY_EXIT" mapto="hide" flags="mr" />
 	</map>
 	
 	<map context="ChannelSelectActions">
-		<key id=" " mapto="selectChannel" flags="mr" />
+		<key id="m" mapto="mark" flags="m" />
+		<!-- yes, this is flexible as hell. -->
+		<key id="p" mapto="bouquet:(provider == PREMIERE)" flags="m" />
+		<key id="d" mapto="bouquet:(provider == ARD)" flags="m" />
+		<key id="a" mapto="bouquet:" flags="m" />
+
+		<key id="KEY_M" mapto="mark" flags="m" />
+		<!-- yes, this is flexible as hell. -->
+		<key id="KEY_P" mapto="bouquet:(provider == PREMIERE)" flags="m" />
+		<key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
+		<key id="KEY_A" mapto="bouquet:" flags="m" />
+	</map>
+	<map context="OkCancelActions">
+		<key id="\x0a" mapto="ok" flags="mr" />
+		<key id="\x1b" mapto="cancel" flags="mr" />
+
+		<!-- use this on rcu, ok? -->
+		<key id="KEY_OK" mapto="ok" flags="mr" />
+		<key id="KEY_EXIT" mapto="cancel" flags="mr" />
+
+		<key id="KEY_ENTER" mapto="ok" flags="mr" />
+		<key id="KEY_ESC" mapto="cancel" flags="mr" />
 	</map>
 	<map context="WindowActions">