From 9efe1f9479e08dccc6fb3d1ac7b0bc4c2fd3e531 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 14 Jan 2006 10:54:13 +0100
Subject: [PATCH] Key macros can now be defined for all non-modeless keys

---
 CONTRIBUTORS |  1 +
 HISTORY      |  3 ++-
 vdr.5        |  7 ++++---
 vdr.c        | 11 +++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4f7f6b61..4db21efa 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -427,6 +427,7 @@ Mirko D
  for suggesting to avoid the external 'find' command to scan the video directory
  for reporting a problem with inconsistent channel and timer lists
  for making the "Play" key in live viewing mode resume a previous replay session
+ for suggesting to allow defining key macros for all non-modeless keys
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index 185f0747..792430d9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4135,7 +4135,7 @@ Video Disk Recorder Revision History
   Schneider).
 - Cleaned up some trailing white space.
 
-2006-01-13: Version 1.3.39
+2006-01-14: Version 1.3.39
 
 - The SVDRP command LSTT now accepts the new option 'id' to have the channels
   of the timers listed with their unique channel ids instead of their numbers
@@ -4160,3 +4160,4 @@ Video Disk Recorder Revision History
   the 'root' user. If you want to have a default vdr user, you can activate and
   adjust the "VDR_USER = vdr" line in your Make.config file (from the original
   patch by Ludwig Nussel).
+- Key macros can now be defined for all non-modeless keys (suggested by Mirko Dölle).
diff --git a/vdr.5 b/vdr.5
index 6103369c..6b54e089 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.45 2006/01/08 11:52:03 kls Exp $
+.\" $Id: vdr.5 1.46 2006/01/14 10:51:48 kls Exp $
 .\"
 .TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files"
 .SH NAME
@@ -407,8 +407,9 @@ whenever the given key is pressed. The format is
 \fBmacrokey  [@plugin] key1 key2 key3...\fR
 
 where \fBmacrokey\fR is the key that shall initiate execution of this macro
-and can be one of \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR or
-\fIUser1\fR...\fIUser9\fR. The rest of the line consists of a set of
+and can be one of \fIUp\fR, \fIDown\fR, \fIOk\fR, \fIBack\fR, \fILeft\fR,
+\fIRight\fR, \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR, \fI0\fR...\fI9\fR
+or \fIUser1\fR...\fIUser9\fR. The rest of the line consists of a set of
 keys, which will be executed just as if they had been pressed in the given
 sequence. The optional \fB@plugin\fR can be used to automatically select
 the given plugin from the main menu (provided that plugin has a main menu
diff --git a/vdr.c b/vdr.c
index b9da3fb4..906c4219 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.236 2006/01/13 16:16:32 kls Exp $
+ * $Id: vdr.c 1.237 2006/01/14 10:20:50 kls Exp $
  */
 
 #include <getopt.h>
@@ -984,6 +984,10 @@ int main(int argc, char *argv[])
            }
         else {
            // Key functions in "normal" viewing mode:
+           if (KeyMacros.Get(key)) {
+              cRemote::PutMacro(key);
+              key = kNone;
+              }
            switch (key) {
              // Toggle channels:
              case k0: {
@@ -1019,11 +1023,6 @@ int main(int argc, char *argv[])
                      cControl::Launch(new cReplayControl);
                      }
                   break;
-             // Key macros:
-             case kRed:
-             case kGreen:
-             case kYellow:
-             case kBlue: cRemote::PutMacro(key); break;
              default:    break;
              }
            }