summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lcd.c75
-rw-r--r--lcd.h2
-rw-r--r--lcdkeyconf.h28
-rw-r--r--lcdproc.c13
4 files changed, 89 insertions, 29 deletions
diff --git a/lcd.c b/lcd.c
index 85800c6..4622343 100644
--- a/lcd.c
+++ b/lcd.c
@@ -6,6 +6,7 @@
#include <sys/time.h>
#include <vdr/config.h>
#include <vdr/tools.h>
+#include <vdr/remote.h>
#include "lcd.h"
#include "sockets.h"
#include "lcdkeyconf.h"
@@ -141,8 +142,11 @@ void cLcd::SetMain( unsigned int n, const char *string) {
ThreadStateData.newscroll=true;
cLcd::Copy(StringBuffer,string,2*wid);
cLcd::Split(StringBuffer,line2,line3);
+ cLcd::SetBuffer(n,NULL,line2,line3,NULL);
+ } else {
+ //cLcd::SetBuffer(n,NULL," \0"," \0",NULL);
+ ThreadStateData.lcdfullbuffer[n][0]='\0';
}
- cLcd::SetBuffer(n,NULL,line2,line3,NULL);
}
void cLcd::SetHelp( unsigned int n, const char *Red, const char *Green, const char *Yellow, const char *Blue) {
@@ -312,33 +316,36 @@ void cLcd::SetBuffer(unsigned int n, const char *l1,const char *l2,const char *l
void cLcd::SetRunning( bool nownext, const char *string1, const char *string2, const char *string3) {
if (!connected) return;
- char line[256];
- char line1[256];
+ char line[1024];
+ char line1[1024];
- snprintf(line,256,"%s %s%s%s",
+ snprintf(line,1024,"%s %s%s%s",
(string1==NULL || string1[0]=='\0')?" ":string1,
(string2==NULL || string2[0]=='\0')?" ":string2,
(string3==NULL || string3[0]=='\0')?"":"|",
(string3==NULL || string3[0]=='\0')?" ":string3);
cLcd::Copy(line1,line,2*wid);
-
+
+
+
if (nownext) {
- cLcd::Split(line1,ThreadStateData.lcdbuffer[LCDMISC][2],ThreadStateData.lcdbuffer[LCDMISC][3]);
- ThreadStateData.lcddirty[LCDMISC][2]=true; ThreadStateData.lcddirty[LCDMISC][3]=true;
+ BeginMutualExclusion();
+ cLcd::Split(line1,ThreadStateData.lcdbuffer[LCDMISC][2],ThreadStateData.lcdbuffer[LCDMISC][3]);
+ ThreadStateData.lcddirty[LCDMISC][2]=true; ThreadStateData.lcddirty[LCDMISC][3]=true;
+ EndMutualExclusion();
} else {
BeginMutualExclusion();
cLcd::Split(line1,ThreadStateData.lcdbuffer[LCDTITLE][2],ThreadStateData.lcdbuffer[LCDTITLE][3]);
ThreadStateData.lcddirty[LCDTITLE][2]=true; ThreadStateData.lcddirty[LCDTITLE][3]=true;
+ cLcd::Copy(ThreadStateData.lcdfullbuffer[LCDTITLE],line,LCDMAXFULLSTRING-3);
+ int i = strlen(ThreadStateData.lcdfullbuffer[LCDTITLE]);
+ ThreadStateData.lcdfullbuffer[LCDTITLE][i++]=' ';
+ ThreadStateData.lcdfullbuffer[LCDTITLE][i++]='*';
+ ThreadStateData.lcdfullbuffer[LCDTITLE][i++]=' ';
+ ThreadStateData.lcdfullbuffer[LCDTITLE][i]='\0';
+ ThreadStateData.newscroll=true;
EndMutualExclusion();
cLcd::SetBuffer(LCDMISC,ThreadStateData.lcdbuffer[LCDTITLE][2],ThreadStateData.lcdbuffer[LCDTITLE][3],NULL,NULL);
-
- cLcd::Copy(ThreadStateData.lcdfullbuffer[LCDTITLE],line,LCDMAXFULLSTRING-3);
- int i = strlen(ThreadStateData.lcdfullbuffer[LCDTITLE]);
- ThreadStateData.lcdfullbuffer[LCDTITLE][i++]=' ';
- ThreadStateData.lcdfullbuffer[LCDTITLE][i++]='*';
- ThreadStateData.lcdfullbuffer[LCDTITLE][i++]=' ';
- ThreadStateData.lcdfullbuffer[LCDTITLE][i]='\0';
- ThreadStateData.newscroll=true;
}
}
@@ -452,8 +459,35 @@ void cLcd::Copy(char *to, const char *from, unsigned int max) { // eliminates ta
}
}
-void cLcd::Split(const char *string, char *string1, char *string2) {
+void cLcd::Split(char *string, char *string1, char *string2) {
+
+ unsigned int i,j,k,ofs;
+
+ if ( (hgt>2 && strlen(string) < 2*wid) && strlen(string) > wid ) { // beautification ..
+
+ if (isalpha(string[wid-1]) && isalpha(string[wid]) ) {
+ j=strlen(string);
+ for (i=wid-1; (i>0) && (string[i]!=' ') && (string[i]!='|') && (string[i]!=',')
+ && (string[i]!='-') && (string[i]!='.') && (string[i]!=':') ; i-- ) {}
+
+ if ( ( (2*wid-j) >= (ofs=wid-(i+1)) ) && ofs+j <= 2*wid ) {
+ string[j+ofs]='\0';
+ for (k=j+ofs-1;k>i+ofs; k-- ) string[k]=string[k-ofs];
+ for (k=0;k<ofs;k++) string[i+k+1]=' ';
+ }
+
+ }
+
+ if ( (j=strlen(string)) < 2*wid && isdigit(string[0]) && isdigit(string[1]) &&
+ string[2]==':' && isdigit(string[3]) && isdigit(string[4]) ) {
+ ofs=2*wid-strlen(string); ofs=(ofs>6)?6:ofs;
+ string[j+ofs]='\0';
+ for (i=j+ofs-1; i>=wid+ofs;i--) string[i]=string[i-ofs];
+ for (i=wid;i<wid+ofs;i++) string[i]=' ';
+ }
+ }
+
strncpy(string1,string,wid+1);
if ( strlen(string) >wid ) {
strncpy(string2,string+wid,wid+1);
@@ -723,9 +757,10 @@ void cLcd::Action(void) { // LCD output thread
// keys
workstring[0]='\0'; sock_recv(sock, workstring, 256);
- if ( strlen(workstring) > 4 ) {
+ if ( LcdMaxKeys && ( strlen(workstring) > 4 ) ) {
for (i=0; i < (strlen(workstring)-4); i++ ) {
if (workstring[i]=='k' && workstring[i+1]=='e' && workstring[i+2]=='y' && workstring[i+3]==' ') {
+ for (j=0; j<LcdMaxKeys && workstring[i+4]!=LcdUsedKeys[j]; j++ ) {}
if (workstring[i+4] == LcdShiftKey) {
LcdShiftkeyPressed = ! LcdShiftkeyPressed;
if (LcdShiftkeyPressed)
@@ -735,11 +770,13 @@ void cLcd::Action(void) { // LCD output thread
}
if ( (workstring[i+4] != LcdShiftKey) ) {
if (LcdShiftkeyPressed) {
- syslog(LOG_INFO, "shiftkey pressed: %c", workstring[i+4] );
+ syslog(LOG_INFO, "shiftkey pressed: %c %d", workstring[i+4],j);
+ cRemote::Put(LcdShiftMap[j]);
LcdShiftkeyPressed=false;
sock_send_string(sock,"screen_set VDR -heartbeat off\n");
} else {
- syslog(LOG_INFO, "normalkey pressed: %c", workstring[i+4] );
+ syslog(LOG_INFO, "normalkey pressed: %c %d", workstring[i+4],j);
+ cRemote::Put(LcdNormalMap[j]);
}
}
}
diff --git a/lcd.h b/lcd.h
index a90ab97..fe7aa07 100644
--- a/lcd.h
+++ b/lcd.h
@@ -69,7 +69,7 @@ class cLcd : public cThread {
void BeginMutualExclusion();
void EndMutualExclusion();
void Copy(char *to, const char *from, unsigned int max);
- void Split(const char *string, char *string1, char *string2);
+ void Split(char *string, char *string1, char *string2);
void Write(int line, const char *string);
void GetTimeDateStat( char *string, unsigned int OutStateData[] );
void Action(void);
diff --git a/lcdkeyconf.h b/lcdkeyconf.h
index ee4f843..50e52ee 100644
--- a/lcdkeyconf.h
+++ b/lcdkeyconf.h
@@ -1,7 +1,27 @@
// LCDproc keys
-const unsigned int LcdMaxKeys = 5;
+const unsigned int LcdMaxKeys = 25;
const unsigned char LcdShiftKey = '#';
-const unsigned char LcdUsedKeys[LcdMaxKeys] = {'0', '3', '6', 'A', '#'};
-//const eKeys LcdNormalMap[LcdMaxKeys] = { kBack, kLeft, kPower, kVolDn, kMute};
-//const eKeys LcdShiftMap[LcdMaxKeys] = { k1, k2, kOk, k4, k8};
+const unsigned char LcdUsedKeys[] =
+
+{ '0', '1', '2', '3', '4',
+ '5', '6', '7', '8', '9',
+ 'q', 'w', 'e', 'r', 'm',
+ 'o', 'b', 'x', 'c', 'a',
+ 'y', 's', 'd', 'f', '#' };
+
+const eKeys LcdNormalMap[] =
+
+{ k0, k1, k2, k3, k4,
+ k5, k6, k7, k8, k9,
+ kRed, kGreen, kYellow, kBlue, kMenu,
+ kOk, kBack, kLeft, kRight, kUp,
+ kDown, kVolDn, kVolUp, kMute, kNone };
+
+const eKeys LcdShiftMap[] =
+
+{ kNone, kNone, kNone, kNone, kNone,
+ kNone, kNone, kNone, kNone, kNone,
+ kNone, kNone, kNone, kNone, kNone,
+ kNone, kNone, kNone, kNone, kNone,
+ kNone, kPower, kNone, kNone, kNone };
diff --git a/lcdproc.c b/lcdproc.c
index eb33460..2c27989 100644
--- a/lcdproc.c
+++ b/lcdproc.c
@@ -14,7 +14,7 @@
#include "i18n.h"
#include "lcd.h"
-static const char *VERSION = "0.0.4";
+static const char *VERSION = "0.0.5";
static const char *MAINMENUENTRY = NULL;
#ifdef LCD_hd44780
static const char *DESCRIPTION = "LCDproc using hd44780 output-mapping";
@@ -30,6 +30,7 @@ cLcd *LCDproc = new cLcd;
bool replaymode=false;
bool menumode=false;
bool switched=false;
+bool textitem=false;
bool group=false;
char tempstringbuffer[80];
char *LCDprocHOST=LCDHOST;
@@ -113,10 +114,12 @@ void cLcdFeed::OsdClear(void)
void cLcdFeed::OsdTitle(const char *Title)
{
//syslog(LOG_INFO, "lcdproc: cLcdFeed::OsdTitle '%s'", Title);
- LCDproc->Clear(0);
- LCDproc->SetTitle(Title);
- LCDproc->SetThreadState( (cLcd::ThreadStates) 0); // MENU
- menumode=true;
+ if ( ! textitem ) {
+ LCDproc->Clear(0);
+ LCDproc->SetTitle(Title);
+ LCDproc->SetThreadState( (cLcd::ThreadStates) 0); // MENU
+ }
+ menumode=true; textitem=false;
}
void cLcdFeed::OsdStatusMessage(const char *Message)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 09:05:06 +0000