X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bb9abed29ca9126cc2b8a0fa3d76ea2e7245cee7..72c8ba6c4d1cceadae9e12d79d3532258614a97e:/lib/dvb_ci/dvbci_mmi.cpp

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index b652da89..d1103c55 100644
--- a/lib/dvb_ci/dvbci_mmi.cpp
+++ b/lib/dvb_ci/dvbci_mmi.cpp
@@ -2,6 +2,7 @@
 
 #include <lib/dvb_ci/dvbci_mmi.h>
 #include <lib/dvb_ci/dvbci_ui.h>
+#include <lib/base/estring.h>
 
 /*
 PyObject *list = PyList_New(len);
@@ -18,12 +19,12 @@ return list;
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {
 	slot = tslot;
-	slot->mmi_session = this;
+	slot->setMMIManager(this);
 }
 
 eDVBCIMMISession::~eDVBCIMMISession()
 {
-	slot->mmi_session = 0;
+	slot->setMMIManager(NULL);
 }
 
 int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
@@ -43,8 +44,36 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 				printf("kann ich nicht. aber das sag ich dem modul nicht.\n");
 			state=stateDisplayReply;
 			return 1;
-		case 0x09:
-		case 0x0c:
+		case 0x07:		//Tmenu_enq
+		{
+			unsigned char *d=(unsigned char*)data;
+			unsigned char *max=((unsigned char*)d) + len;
+			int textlen = len - 2;
+
+			printf("in enq\n");
+			
+			if ((d+2) > max)
+				break;
+				
+			int blind = *d++ & 1;
+			int alen = *d++;
+
+			printf("%d bytes text\n", textlen);
+			if ((d+textlen) > max)
+				break;
+			
+			char str[textlen + 1];
+			memcpy(str, ((char*)d), textlen);
+			str[textlen] = '\0';
+			
+			printf("enq-text: %s\n",str);
+			
+			eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, (char*)convertDVBUTF8(str).c_str());
+
+			break;		
+		}
+		case 0x09:		//Tmenu_last
+		case 0x0c:		//Tlist_last
 		{
 			unsigned char *d=(unsigned char*)data;
 			unsigned char *max=((unsigned char*)d) + len;
@@ -55,9 +84,9 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 			int n=*d++;
 			
 			//FIXME: slotid
-			if(tag[2] == 0x09)
+			if(tag[2] == 0x09)	//menu
 				eDVBCI_UI::getInstance()->mmiScreenBegin(0, 0);
-			else
+			else								//list
 				eDVBCI_UI::getInstance()->mmiScreenBegin(0, 1);
 			
 			if (n == 0xFF)
@@ -81,7 +110,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 				memcpy(str, ((char*)d), textlen);
 				str[textlen] = '\0';
 				
-				eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, str);
+				eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, (char*)convertDVBUTF8(str).c_str());
 					
 				while (textlen--)
 					printf("%c", *d++);
@@ -111,8 +140,9 @@ int eDVBCIMMISession::doAction()
 		unsigned char tag[]={0x9f, 0x88, 0x02};
 		unsigned char data[]={0x01, 0x01};
 		sendAPDU(tag, data, 2);
-		state=stateFakeOK;
-		return 1;
+		state=stateIdle;
+		//state=stateFakeOK;
+		//return 1;
 		break;
 	}
 	case stateFakeOK:
@@ -138,6 +168,8 @@ int eDVBCIMMISession::stopMMI()
 	unsigned char tag[]={0x9f, 0x88, 0x00};
 	unsigned char data[]={0x00};
 	sendAPDU(tag, data, 1);
+	
+	return 0;
 }
 
 int eDVBCIMMISession::answerText(int answer)
@@ -148,5 +180,33 @@ int eDVBCIMMISession::answerText(int answer)
 	unsigned char data[]={0x00};
 	data[0] = answer & 0xff;
 	sendAPDU(tag, data, 1);
+	
+	return 0;
+}
+
+int eDVBCIMMISession::answerEnq(char *answer)
+{
+	unsigned int len = strlen(answer);
+	printf("eDVBCIMMISession::answerEnq(%d bytes)\n", len);
+
+	unsigned char data[len+1];
+	data[0] = 0x01; // answer ok
+	memcpy(data+1, answer, len);
+
+	unsigned char tag[]={0x9f, 0x88, 0x08};
+	sendAPDU(tag, data, len+1);
+
+	return 0;
+}
+
+int eDVBCIMMISession::cancelEnq()
+{
+	printf("eDVBCIMMISession::cancelEnq()\n");
+
+	unsigned char tag[]={0x9f, 0x88, 0x08};
+	unsigned char data[]={0x00}; // canceled
+	sendAPDU(tag, data, 1);
+	
+	return 0;
 }