Changeset f102b57751534d544f1270a3c10a048a29b3b3b7 for lxdialog/menubox.c

Timestamp:

09/11/07 12:55:01 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1189508101 +0000

git-parent:

[d6008a8bb8e5e76d77dd15a654fc2fabef8910e9]

git-author:

Rafaël Carré <funman@videolan.org> 1189508101 +0000

Message:

Same for lxdialog and xvmc

Files:

• lxdialog/menubox.c (modified) (20 diffs)

lxdialog/menubox.c

@@ -27 +27 @@
- *    *)  A bugfix for the Page-Down problem
- *
-
+ 
- *        to the first position in the menu box.  Now lxdialog is a bit
- *        smarter and works more like other menu systems (just have a look at
@@ -81 +81 @@
-        int i;
-        for (i = 0; i < menu_width; i++)
-    
+   
-    }
-#else
@@ -89 +89 @@
-    mvwaddstr (win, choice, item_x, menu_item);
-    if (hotkey) {
-    
-    
+   
+   
-    }
-    if (selected) {
-    
-    
+   
+   
-    }
-}
@@ -103 +103 @@
-static void
-print_arrows (WINDOW * win, int item_no, int scroll,
-        
+       
-{
-    int cur_y, cur_x;
@@ -112 +112 @@
-
-    if (scroll > 0) {
-    
-    
-    
+   
+   
+   
-    }
-    else {
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
-    }
-
@@ -128 +128 @@
-
-   if ((height < item_no) && (scroll + height < item_no)) {
-    
-    
-    
+   
+   
+   
-    }
-    else {
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
-   }
-
@@ -165 +165 @@
-int
-dialog_menu (const char *title, const char *prompt, int height, int width,
-        
-        
+       
+       
-
-{
@@ -189 +189 @@
-    mvwaddch (dialog, height - 3, 0, ACS_LTEE);
-    for (i = 0; i < width - 2; i++)
-    
+   
-    wattrset (dialog, dialog_attr);
-    wbkgdset (dialog, dialog_attr & A_COLOR);
@@ -195 +195 @@
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
-    }
-
-    if (title != NULL) {
-    
-    
-    
-    
+   
+   
+   
+   
-    }
-
@@ -218 +218 @@
-    /* create new window for the menu */
-    menu = subwin (dialog, menu_height, menu_width,
-        
+       
-    keypad (menu, TRUE);
-
-    /* draw a box around the menu items */
-    draw_box (dialog, box_y, box_x, menu_height + 2, menu_width + 2,
-    
+   
-
-    /*
-     * Find length of longest item in order to center menu.
-
+ 
-     */
-    item_x = 0;
-    for (i = 0; i < item_no; i++) {
-    
-    
+   
+   
-    }
-
@@ -239 +239 @@
-    /* get the scroll info from the temp file */
-    if ( (f=fopen("lxdialog.scrltmp","r")) != NULL ) {
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-    }
-    if ( (choice >= max_choice) || (f==NULL && choice >= max_choice/2) ) {
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
-    }
-
-    /* Print the menu */
-    for (i=0; i < max_choice; i++) {
-    
+   
-                    (items[(first_item + i)*2][0] != ':'));
-    }
@@ -269 +269 @@
-
-    print_arrows(dialog, item_no, scroll,
-        
+       
-
-    print_buttons (dialog, height, width, 0);
@@ -276 +276 @@
-
-    while (key != ESC) {
-    
-
-    
-
-    
-        
-    
+   
+
+   
+
+   
+       
+   
-        for (i = choice+1; i < max_choice; i++) {
-        
-        
-    
-    
-    
-        
-            
-            
-        
-        
-    
-
-
+       
+       
+   
+   
+   
+        
+           
+           
+       
+       
+   
+
+
-            key == KEY_UP || key == KEY_DOWN ||
-            key == '-' || key == '+' ||
@@ -304 +304 @@
-                       (items[(scroll+choice)*2][0] != ':'));
-
-    
+   
-                if (choice < 2 && scroll) {
-    
+   
-                    scrollok (menu, TRUE);
-                    wscrl (menu, -1);
@@ -315 +315 @@
-                    print_item (menu, items[scroll * 2 + 1], 0, FALSE,
-                               (items[scroll*2][0] != ':'));
-        
-        
-
-    
-
-        
+       
+       
+
+   
+
+       
-                                (items[(scroll+choice)*2][0] != ':'));
-
@@ -326 +326 @@
-                    (scroll + max_choice < item_no)
-                   ) {
-        
-        
+       
+       
-                    scroll (menu);
-                    scrollok (menu, FALSE);
@@ -339 +339 @@
-                    choice = MIN(choice+1, max_choice-1);
-
-    
-    
+   
+   
-                for (i=0; (i < max_choice); i++) {
-                    if (scroll > 0) {
-    
-    
-    
-    
+   
+   
+   
+   
-                    } else {
-                        if (choice > 0)
@@ -357 +357 @@
-                for (i=0; (i < max_choice); i++) {
-                    if (scroll+max_choice < item_no) {
-            
-            
-            
-    
-    
-            
-            
-        
-            
-            
-        
+           
+           
+           
+   
+   
+           
+           
+       
+           
+           
+       
-                }
-
@@ -382 +382 @@
-            wrefresh (menu);
-
-        continue;        
+       continue;       
-        }
-
-    
-    
-    
-    
-    
-            
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-        
-        
-    
-    
+   
+   
+   
+   
+   
+           
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+       
+       
+   
+   
-            fprintf(stderr, "%s\n", items[(scroll + choice) * 2]);
-            switch (key) {
@@ -414 +414 @@
-            case ' ': return 6;
-            }
-    
-    
-    
-    
-    
-    
-
-    fprintf(stderr, "%s \"%s\"\n",
-            
-            
-            
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
+   
+
+   fprintf(stderr, "%s \"%s\"\n", 
+           
+           
+           
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
-    }
-
-    delwin (dialog);
-    remove("lxdialog.scrltmp");
-            
+         
-}