Changeset 38396

Timestamp:

08/28/16 11:27:56 (7 years ago)

Author:

gost

Message:

[titan] test... save pin

Location:

titan/titan

Files:

• ca.h (modified) (3 diffs)
• textinput.h (modified) (1 diff)

titan/titan/ca.h

@@ -419 +419 @@
 int cammiAPDU(struct dvbdev* dvbnode, int sessionnr, unsigned char *tag, void *data, int len)
 {
-        char* tmpstr = NULL, *tmpstr1 = NULL;
+        char* tmpstr = NULL, *tmpstr1 = NULL, *tmpstr2 = NULL;
         struct casession* casession = NULL;
         struct menulist* mlist = NULL, *mbox = NULL;
@@ -484 +484 @@
                                         ostrcat(tmpstr, getconfig("ca0_pin", NULL), 0, 0);
                                   }
-                                }
+                                  tmpstr2 = ostrcat(tmpstr2, "ca0_pin", 1, 0);
+                                }
+                                if(ostrstr(str, "Bitte versuchen Sie es erneut") != NULL)
+                                        tmpstr2 = ostrcat(tmpstr2, "ca0_pin", 1, 0);
                                 if(ca0autopin == 0)      
-                                        tmpstr = textinput(str, tmpstr1);
+                                        tmpstr = textinputsave(str, tmpstr1, tmpstr2);
                                 if(tmpstr == NULL)
                                         cammicancelenq(dvbnode, sessionnr);
@@ -496 +499 @@
                                 free(tmpstr); tmpstr = NULL;
                                 free(tmpstr1); tmpstr1 = NULL;
+                                free(tmpstr2); tmpstr2 = NULL;
 
                         }

titan/titan/textinput.h

@@ -73 +73 @@
 }
 
+char* textinputsave(char* title, char* text, char* tconfig)
+{
+        int rcret = -1, fromthread = 0, height = 0;
+        struct skin* textinput = getscreen("textinput");
+        struct skin* input = getscreennode(textinput, "input");
+        struct skin* framebuffer = getscreen("framebuffer");
+        char* ret = NULL, *bg = NULL;
+
+        if(pthread_self() != status.mainthread)
+                fromthread = 1;
+
+        if(title == NULL) title = ostrcat(_("Input field"), NULL, 0, 0);
+
+        changetitle(textinput, title);
+        height = textinput->height;
+        if(title != NULL)
+                textinput->height += textinput->fontsize + 6 + (textinput->bordersize * 2);
+        changeinput(input, text);
+
+        if(fromthread == 1)
+        {
+                delrc(getrcconfigint("rcvolup", NULL), NULL, NULL);
+                delrc(getrcconfigint("rcvoldown", NULL), NULL, NULL);
+                delrc(getrcconfigint("rcmute", NULL), NULL, NULL);
+                m_lock(&status.drawingmutex, 0);
+                m_lock(&status.rcmutex, 10);
+                setnodeattr(textinput, framebuffer, 2);
+                status.rcowner = textinput;
+                bg = savescreen(textinput);
+                drawscreen(textinput, 0, 2);
+        }
+        else
+                drawscreen(textinput, 0, 0);
+        addscreenrc(textinput, input);
+
+        while(1)
+        {
+                rcret = waitrc(textinput, 0, 0);
+                if(rcret == getrcconfigint("rcexit", NULL)) break;
+                if(rcret == getrcconfigint("rcyellow", NULL))
+                {
+                        ret = ostrcat(input->input, NULL, 0, 0);
+                        if(tconfig != NULL)
+                                addconfig(tconfig, ret);
+                        break;
+                }
+                if(rcret == getrcconfigint("rcok", NULL))
+                {
+                        ret = ostrcat(input->input, NULL, 0, 0);
+                        break;
+                }
+        }
+
+        delownerrc(textinput);
+
+        if(fromthread == 1)
+        {
+                clearscreennolock(textinput);
+                restorescreen(bg, textinput);
+                blitfb(0);
+                sleep(1);
+                status.rcowner = NULL;
+                m_unlock(&status.rcmutex, 3);
+                m_unlock(&status.drawingmutex, 0);
+                addrc(getrcconfigint("rcvolup", NULL), screenvolumeup, NULL, NULL);
+                addrc(getrcconfigint("rcvoldown", NULL), screenvolumedown, NULL, NULL);
+                addrc(getrcconfigint("rcmute", NULL), screenmute, NULL, NULL);
+        }
+        else
+        {
+                clearscreen(textinput);
+                drawscreen(skin, 0, 0);
+        }
+
+        textinput->height = height;
+        return ret;
+}
+
 #endif