mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
VDR developer version 2.1.1 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.1.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-2.0.0-2.1.1.diff MD5 checksums: b17f9838bb8ddee9620f838fea7a171d vdr-2.1.1.tar.bz2 8b8ca593885c380cd370e6d19a5b16a1 vdr-2.0.0-2.1.1.diff WARNING: ======== This is a *developer* version. Even though *I* use it in my productive environment, I strongly recommend that you only use it under controlled conditions and for testing and debugging. The main focus of this version is on adding basic support for positioners to control steerable satellite dishes. Manually controlling the dish position and storing individual positions will follow later. The fixes contained in this version will be released in a stable version 2.0.3 later, if there are no problems. From the HISTORY file: - Fixed initializing cDevice::keepTracks. - Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than one character (reported by Stefan Braun). - Removed all "modified since version 1.6" markers from PLUGINS.html. - Added definitions for older DVB API versions, back until 5.0 (based on a patch from Udo Richter). - Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to improve overall performance when an editing process is running (thanks to Jochen Dolze). - Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is used (thanks to Lars Hanisch). - Changed the sign of the satellite position value in cSource to reflect the standard of western values being negative. The new member function cSource::Position() can be used to retrieve the orbital position of a satellite. - Fixed multiple occurrences of the same directory in the recordings list in case there are directories that only differ in non-alphanumeric characters (was broken by "Fixed selecting the last replayed recording in the Recordings menu in case there are folders and plain recordings with names that differ only in non-alphanumeric characters" in version 1.7.36). - Fixed displaying the frame number when setting an editing mark (thanks to Thomas Günther). - Fixed no longer generating any editing marks if the edited recording results in just one single sequence (reported by Halim Sahin). - Fixed an error message when parsing SCR values in diseqc.conf. - Fixed an unexpected RCS version tag in the newplugin script. - Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported by Stefan Braun). - Fixed a crash in the LCARS skin's main menu in case there is no current channel (reported by Dominique Dumont). - Added basic support for positioners to control steerable satellite dishes (based on a patch from Seppo Ingalsuo and Ales Jurik). + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS"). + The new DiSEqC command code 'P' can be used to instruct a positioner to move the dish to the required satellite position. When a 'P' code is processed, further execution of the remaining DiSEqC sequence (if any) is postponed until the positioner has reached the new satellite position. + The new special source value of "S360E" can be used in diseqc.conf to indicate that an entry using a positioner can move the dish to any requested position within its range. Think of it as "full circle". + The devices a particular cDiseqc or cScr applies to are now stored directly in each cDiseqc or cScr, respectively. + A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners"). + The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to show the user a progress display when the dish is being moved. The default implementation calls SetMessage() with a string indicating the new position the dish is being moved to. The LCARS skin shows a progress bar indicating the movement of the dish. + The new parameters "Site latitude", "Site longitude", "Positioner speed", and "Positioner swing" in the "Setup/LNB" menu can be used to configure the necessary values for a steerable dish. + The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable dish has reached its target position. Parsing SI data is paused until the target position has been reached. - The LCARS skin now shows the source value of the current channel in its channel display. - Fixed asserting free disk space in the cutter. - No longer trying to delete old recordings in AssertFreeDiskSpace() if the given Priority is less than 1. - Fixed handling LIRC events in case repeated events are lost. - Fixed a possible crash when shutting down VDR while subtitles are being displayed (reported by Ville Skyttä). - cDevice::IsPrimaryDevice() now also checks whether the primary device actually has a decoder and returns false otherwise. This should improve device allocation on systems that are only used as a receiver and don't actually display anything. - Increased the value of MAXRETRIES to 20 to reduce the probability of disturbances in transfer mode. - All bonded devices (except for the master) now turn off their LNB power completely to avoid problems when receiving vertically polarized transponders (suggested by Manfred Völkel and Oliver Endriss). - Reverted the change from version 1.5.7 that made all logging go to LOG_ERR (thanks to Christopher Reimer). - Added Begin/EndSegmentTransfer() to the EPG handler interface (thanks to Jörg Wendel). - The code for distributing recordings over several video directories is now deprecated and disabled by default. You can re-enable this feature by removing the comment sign ('//') from the beginning of the line //#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is ... in the file videodir.c. Note, though, that this can only be a temporary workaround. This feature will be completely removed in one of the next developer versions. Distributing the video directory over several disks was a useful feature in times when disks were still relatively small, but it also caused serious problems in case one of the disks failed. Nowadays hard disks come in sizes measured in terabytes, and tools like "mhddfs" can be used to combine several disks to form one large volume. A recommended method for a relatively safe disk setup in a VDR system is to use two 1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk fails, you can replace it without data loss.
420 lines
10 KiB
C
420 lines
10 KiB
C
/*
|
|
* remote.c: General Remote Control handling
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: remote.c 3.0 2013/02/03 15:44:55 kls Exp $
|
|
*/
|
|
|
|
#include "remote.h"
|
|
#include <fcntl.h>
|
|
#define __STDC_FORMAT_MACROS // Required for format specifiers
|
|
#include <inttypes.h>
|
|
#include <netinet/in.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include <unistd.h>
|
|
#include "tools.h"
|
|
|
|
// --- cRemote ---------------------------------------------------------------
|
|
|
|
#define INITTIMEOUT 10000 // ms
|
|
#define REPEATTIMEOUT 1000 // ms
|
|
|
|
eKeys cRemote::keys[MaxKeys];
|
|
int cRemote::in = 0;
|
|
int cRemote::out = 0;
|
|
cTimeMs cRemote::repeatTimeout(-1);
|
|
cRemote *cRemote::learning = NULL;
|
|
char *cRemote::unknownCode = NULL;
|
|
cMutex cRemote::mutex;
|
|
cCondVar cRemote::keyPressed;
|
|
const char *cRemote::keyMacroPlugin = NULL;
|
|
const char *cRemote::callPlugin = NULL;
|
|
bool cRemote::enabled = true;
|
|
time_t cRemote::lastActivity = 0;
|
|
|
|
cRemote::cRemote(const char *Name)
|
|
{
|
|
name = Name ? strdup(Name) : NULL;
|
|
Remotes.Add(this);
|
|
}
|
|
|
|
cRemote::~cRemote()
|
|
{
|
|
Remotes.Del(this, false);
|
|
free(name);
|
|
}
|
|
|
|
const char *cRemote::GetSetup(void)
|
|
{
|
|
return Keys.GetSetup(Name());
|
|
}
|
|
|
|
void cRemote::PutSetup(const char *Setup)
|
|
{
|
|
Keys.PutSetup(Name(), Setup);
|
|
}
|
|
|
|
bool cRemote::Initialize(void)
|
|
{
|
|
if (Ready()) {
|
|
char *NewCode = NULL;
|
|
eKeys Key = Get(INITTIMEOUT, &NewCode);
|
|
if (Key != kNone || NewCode)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void cRemote::Clear(void)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
in = out = 0;
|
|
if (learning) {
|
|
free(unknownCode);
|
|
unknownCode = NULL;
|
|
}
|
|
}
|
|
|
|
bool cRemote::Put(eKeys Key, bool AtFront)
|
|
{
|
|
if (Key != kNone) {
|
|
cMutexLock MutexLock(&mutex);
|
|
if (in != out && (keys[out] & k_Repeat) && (Key & k_Release))
|
|
Clear();
|
|
int d = out - in;
|
|
if (d <= 0)
|
|
d = MaxKeys + d;
|
|
if (d - 1 > 0) {
|
|
if (AtFront) {
|
|
if (--out < 0)
|
|
out = MaxKeys - 1;
|
|
keys[out] = Key;
|
|
}
|
|
else {
|
|
keys[in] = Key;
|
|
if (++in >= MaxKeys)
|
|
in = 0;
|
|
}
|
|
keyPressed.Broadcast();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
return true; // only a real key shall report an overflow!
|
|
}
|
|
|
|
bool cRemote::PutMacro(eKeys Key)
|
|
{
|
|
const cKeyMacro *km = KeyMacros.Get(Key);
|
|
if (km) {
|
|
keyMacroPlugin = km->Plugin();
|
|
cMutexLock MutexLock(&mutex);
|
|
for (int i = km->NumKeys(); --i > 0; ) {
|
|
if (!Put(km->Macro()[i], true))
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
|
|
{
|
|
char buffer[32];
|
|
snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code);
|
|
return Put(buffer, Repeat, Release);
|
|
}
|
|
|
|
bool cRemote::Put(const char *Code, bool Repeat, bool Release)
|
|
{
|
|
if (learning && this != learning)
|
|
return false;
|
|
eKeys Key = Keys.Get(Name(), Code);
|
|
if (Key != kNone) {
|
|
if (Repeat)
|
|
Key = eKeys(Key | k_Repeat);
|
|
if (Release)
|
|
Key = eKeys(Key | k_Release);
|
|
return Put(Key);
|
|
}
|
|
if (learning) {
|
|
free(unknownCode);
|
|
unknownCode = strdup(Code);
|
|
keyPressed.Broadcast();
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool cRemote::CallPlugin(const char *Plugin)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
if (!callPlugin) {
|
|
callPlugin = Plugin;
|
|
Put(k_Plugin);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const char *cRemote::GetPlugin(void)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
const char *p = keyMacroPlugin;
|
|
if (p)
|
|
keyMacroPlugin = NULL;
|
|
else {
|
|
p = callPlugin;
|
|
callPlugin = NULL;
|
|
}
|
|
return p;
|
|
}
|
|
|
|
bool cRemote::HasKeys(void)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
return in != out && !(keys[out] & k_Repeat);
|
|
}
|
|
|
|
eKeys cRemote::Get(int WaitMs, char **UnknownCode)
|
|
{
|
|
for (;;) {
|
|
cMutexLock MutexLock(&mutex);
|
|
if (in != out) {
|
|
eKeys k = keys[out];
|
|
if (++out >= MaxKeys)
|
|
out = 0;
|
|
if ((k & k_Repeat) != 0)
|
|
repeatTimeout.Set(REPEATTIMEOUT);
|
|
TriggerLastActivity();
|
|
return enabled ? k : kNone;
|
|
}
|
|
else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut())
|
|
return kNone;
|
|
else if (learning && UnknownCode && unknownCode) {
|
|
*UnknownCode = unknownCode;
|
|
unknownCode = NULL;
|
|
return kNone;
|
|
}
|
|
}
|
|
}
|
|
|
|
void cRemote::TriggerLastActivity(void)
|
|
{
|
|
lastActivity = time(NULL);
|
|
}
|
|
|
|
// --- cRemotes --------------------------------------------------------------
|
|
|
|
cRemotes Remotes;
|
|
|
|
// --- cKbdRemote ------------------------------------------------------------
|
|
|
|
struct tKbdMap {
|
|
eKbdFunc func;
|
|
uint64_t code;
|
|
};
|
|
|
|
static tKbdMap KbdMap[] = {
|
|
{ kfF1, 0x0000001B5B31317EULL },
|
|
{ kfF2, 0x0000001B5B31327EULL },
|
|
{ kfF3, 0x0000001B5B31337EULL },
|
|
{ kfF4, 0x0000001B5B31347EULL },
|
|
{ kfF5, 0x0000001B5B31357EULL },
|
|
{ kfF6, 0x0000001B5B31377EULL },
|
|
{ kfF7, 0x0000001B5B31387EULL },
|
|
{ kfF8, 0x0000001B5B31397EULL },
|
|
{ kfF9, 0x0000001B5B32307EULL },
|
|
{ kfF10, 0x0000001B5B32317EULL },
|
|
{ kfF11, 0x0000001B5B32327EULL },
|
|
{ kfF12, 0x0000001B5B32337EULL },
|
|
{ kfUp, 0x00000000001B5B41ULL },
|
|
{ kfDown, 0x00000000001B5B42ULL },
|
|
{ kfLeft, 0x00000000001B5B44ULL },
|
|
{ kfRight, 0x00000000001B5B43ULL },
|
|
{ kfHome, 0x00000000001B5B48ULL },
|
|
{ kfEnd, 0x00000000001B5B46ULL },
|
|
{ kfPgUp, 0x000000001B5B357EULL },
|
|
{ kfPgDown, 0x000000001B5B367EULL },
|
|
{ kfIns, 0x000000001B5B327EULL },
|
|
{ kfDel, 0x000000001B5B337EULL },
|
|
{ kfNone, 0x0000000000000000ULL }
|
|
};
|
|
|
|
bool cKbdRemote::kbdAvailable = false;
|
|
bool cKbdRemote::rawMode = false;
|
|
|
|
cKbdRemote::cKbdRemote(void)
|
|
:cRemote("KBD")
|
|
,cThread("KBD remote control")
|
|
{
|
|
tcgetattr(STDIN_FILENO, &savedTm);
|
|
struct termios tm;
|
|
if (tcgetattr(STDIN_FILENO, &tm) == 0) {
|
|
tm.c_iflag = 0;
|
|
tm.c_lflag &= ~(ICANON | ECHO);
|
|
tm.c_cc[VMIN] = 0;
|
|
tm.c_cc[VTIME] = 0;
|
|
tcsetattr(STDIN_FILENO, TCSANOW, &tm);
|
|
}
|
|
kbdAvailable = true;
|
|
Start();
|
|
}
|
|
|
|
cKbdRemote::~cKbdRemote()
|
|
{
|
|
kbdAvailable = false;
|
|
Cancel(3);
|
|
tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
|
|
}
|
|
|
|
void cKbdRemote::SetRawMode(bool RawMode)
|
|
{
|
|
rawMode = RawMode;
|
|
}
|
|
|
|
uint64_t cKbdRemote::MapFuncToCode(int Func)
|
|
{
|
|
for (tKbdMap *p = KbdMap; p->func != kfNone; p++) {
|
|
if (p->func == Func)
|
|
return p->code;
|
|
}
|
|
return (Func <= 0xFF) ? Func : 0;
|
|
}
|
|
|
|
int cKbdRemote::MapCodeToFunc(uint64_t Code)
|
|
{
|
|
for (tKbdMap *p = KbdMap; p->func != kfNone; p++) {
|
|
if (p->code == Code)
|
|
return p->func;
|
|
}
|
|
if (Code <= 0xFF)
|
|
return Code;
|
|
return kfNone;
|
|
}
|
|
|
|
void cKbdRemote::PutKey(uint64_t Code, bool Repeat, bool Release)
|
|
{
|
|
if (rawMode || !Put(Code, Repeat, Release)) {
|
|
if (int func = MapCodeToFunc(Code))
|
|
Put(KBDKEY(func), Repeat, Release);
|
|
}
|
|
}
|
|
|
|
int cKbdRemote::ReadKey(void)
|
|
{
|
|
cPoller Poller(STDIN_FILENO);
|
|
if (Poller.Poll(50)) {
|
|
uchar ch = 0;
|
|
int r = safe_read(STDIN_FILENO, &ch, 1);
|
|
if (r == 1)
|
|
return ch;
|
|
if (r < 0)
|
|
LOG_ERROR_STR("cKbdRemote");
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
uint64_t cKbdRemote::ReadKeySequence(void)
|
|
{
|
|
uint64_t k = 0;
|
|
int key1;
|
|
|
|
if ((key1 = ReadKey()) >= 0) {
|
|
k = key1;
|
|
if (key1 == 0x1B) {
|
|
// Start of escape sequence
|
|
if ((key1 = ReadKey()) >= 0) {
|
|
k <<= 8;
|
|
k |= key1 & 0xFF;
|
|
switch (key1) {
|
|
case 0x4F: // 3-byte sequence
|
|
if ((key1 = ReadKey()) >= 0) {
|
|
k <<= 8;
|
|
k |= key1 & 0xFF;
|
|
}
|
|
break;
|
|
case 0x5B: // 3- or more-byte sequence
|
|
if ((key1 = ReadKey()) >= 0) {
|
|
k <<= 8;
|
|
k |= key1 & 0xFF;
|
|
switch (key1) {
|
|
case 0x31 ... 0x3F: // more-byte sequence
|
|
case 0x5B: // strange, may apparently occur
|
|
do {
|
|
if ((key1 = ReadKey()) < 0)
|
|
break; // Sequence ends here
|
|
k <<= 8;
|
|
k |= key1 & 0xFF;
|
|
} while (key1 != 0x7E);
|
|
break;
|
|
default: ;
|
|
}
|
|
}
|
|
break;
|
|
default: ;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return k;
|
|
}
|
|
|
|
void cKbdRemote::Action(void)
|
|
{
|
|
cTimeMs FirstTime;
|
|
cTimeMs LastTime;
|
|
uint64_t FirstCommand = 0;
|
|
uint64_t LastCommand = 0;
|
|
bool Delayed = false;
|
|
bool Repeat = false;
|
|
|
|
while (Running()) {
|
|
uint64_t Command = ReadKeySequence();
|
|
if (Command) {
|
|
if (Command == LastCommand) {
|
|
// If two keyboard events with the same command come in without an intermediate
|
|
// timeout, this is a long key press that caused the repeat function to kick in:
|
|
Delayed = false;
|
|
FirstCommand = 0;
|
|
if (FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay)
|
|
continue; // repeat function kicks in after a short delay
|
|
if (LastTime.Elapsed() < (uint)Setup.RcRepeatDelta)
|
|
continue; // skip same keys coming in too fast
|
|
PutKey(Command, true);
|
|
Repeat = true;
|
|
LastTime.Set();
|
|
}
|
|
else if (Command == FirstCommand) {
|
|
// If the same command comes in twice with an intermediate timeout, we
|
|
// need to delay the second command to see whether it is going to be
|
|
// a repeat function or a separate key press:
|
|
Delayed = true;
|
|
}
|
|
else {
|
|
// This is a totally new key press, so we accept it immediately:
|
|
PutKey(Command);
|
|
Delayed = false;
|
|
FirstCommand = Command;
|
|
FirstTime.Set();
|
|
}
|
|
}
|
|
else if (Repeat) {
|
|
// Timeout after a repeat function, so we generate a 'release':
|
|
PutKey(LastCommand, false, true);
|
|
Repeat = false;
|
|
}
|
|
else if (Delayed && FirstCommand) {
|
|
// Timeout after two normal key presses of the same key, so accept the
|
|
// delayed key:
|
|
PutKey(FirstCommand);
|
|
Delayed = false;
|
|
FirstCommand = 0;
|
|
FirstTime.Set();
|
|
}
|
|
LastCommand = Command;
|
|
}
|
|
}
|