Changeset 15261

Timestamp:

04/14/12 13:00:04 (11 years ago)

Author:

nit

Message:

[titan] extend menulist

Location:

titan/titan

Files:

• ipkg.h (modified) (1 diff)
• menulist.h (modified) (8 diffs)
• struct.h (modified) (1 diff)

titan/titan/ipkg.h

@@ -553 +553 @@
 
                         tmpmlist = addmenulist(&mlist, tmpstr, tmpinfo, tmppic, 0, 0);
-                        changemenulistparam(tmpmlist, node->showname);
+                        changemenulistparam(tmpmlist, node->showname, NULL);
                         free(tmpstr); tmpstr = NULL;
                         free(tmpinfo); tmpinfo = NULL;

titan/titan/menulist.h

@@ -26 +26 @@
                                 free(prev->param);
                                 prev->param = NULL;
+
+                                free(prev->param1);
+                                prev->param1 = NULL;
                         }
 
@@ -35 +38 @@
 }
 
-void changemenulistparam(struct menulist* mlist, char* param)
+void changemenulistparam(struct menulist* mlist, char* param, char* param1)
 {
         if(mlist != NULL)
@@ -41 +44 @@
                 free(mlist->param);
                 mlist->param = ostrcat(param, NULL, 0, 0);
+
+                free(mlist->param1);
+                mlist->param1 = ostrcat(param1, NULL, 0, 0);
         }
 }
@@ -114 +120 @@
 // showpng = 2 (big icon)
 //flag 1: rcgreen = subchannel
-struct menulist* menulistbox(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* defaultpic, int showpng, int flag)
+struct menulist* menulistboxext(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* defaultpic, int showpng, int* rcreturn, int flag)
 {
         debug(1000, "in");
@@ -126 +132 @@
         char* tmppic = NULL;
         char* tmpstr = NULL;
-
-        if(mlist == NULL) return 0;
 
         if(pthread_self() != status.mainthread)
@@ -249 +253 @@
         addscreenrc(screen, listbox);
 
-        while (1)
+        while(1)
         {
                 rcret = waitrc(screen, 0, 0);
-
-                if(rcret==getrcconfigint("rcexit", NULL)) break;
-                if(flag == 1 && rcret==getrcconfigint("rcgreen", NULL))
+                if(rcreturn != NULL) *rcreturn = rcret;
+
+                if(rcret == getrcconfigint("rcexit", NULL)) break;
+                if(flag == 1 && rcret == getrcconfigint("rcgreen", NULL))
                 {
                         clearscreen(screen);
@@ -260 +265 @@
                         break;
                 }
-                if(listbox->select != NULL && rcret==getrcconfigint("rcok", NULL))
+                if(rcret == getrcconfigint("rcok", NULL) || rcret == getrcconfigint("rcred", NULL) || rcret == getrcconfigint("rcgreen", NULL) || rcret == getrcconfigint("rcyellow", NULL) || rcret == getrcconfigint("rcblue", NULL))
                 {
-                        ret = (struct menulist*)listbox->select->handle;
+                        if(rcreturn == NULL && rcret != getrcconfigint("rcok", NULL))
+                                continue;
+
+                        if(listbox->select != NULL)
+                                ret = (struct menulist*)listbox->select->handle;
                         break;
                 }
@@ -290 +299 @@
 }
 
+struct menulist* menulistbox(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* defaultpic, int showpng, int flag)
+{
+        return menulistboxext(mlist, paramskinname, skintitle, paramskinpath, defaultpic, showpng, NULL, flag);
+}
 #endif

titan/titan/struct.h

@@ -178 +178 @@
         char* pic;
         char* param;
+        char* param1;
         int deaktiv;
         int defaultentry;