More work on List controls. Used in GUI Skin selector now

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@879 416bcca6-2ee7-4201-b75f-2eb2f807beb1

buttons.c

@@ -958,60 +958,50 @@ void Button_Settings(void)
   Set_number_of_backups(Config.Max_undo_pages);
 }
 
-
+// Add a skin to the list
-#define FILESEL_Y 52
+void Add_skin(const char *name)
-void Display_skins_list(short offset_first, short selector_offset)
-//
-// offset_first = Décalage entre le premier fichier visible dans le
-//                   sélecteur et le premier fichier de la liste
-//
-// selector_offset  = Décalage entre le premier fichier visible dans le
-//                   sélecteur et le fichier sélectionné dans la liste
-//
 {
-  T_Fileselector_item * current_item;
+  char * fname;
-  byte   index;  // index du fichier qu'on affiche (0 -> 9)
-  byte   text_color;
-  byte   background_color;
 
+  Add_element_to_list(name, 0);  
+  Filelist_nb_elements++;
   
-  // On vérifie s'il y a au moins 1 fichier dans la liste:
+  // Cut the long name to keep only filename (no directory)
-  if (Filelist_nb_elements>0)
+  fname = Find_last_slash(Filelist->Full_name);
-  {
+  if (fname[0]=='\0')
-    // On commence par chercher à pointer sur le premier fichier visible:
+    return;
-    current_item=Filelist;
-    for (;offset_first>0;offset_first--)
-      current_item=current_item->Next;
 
-    // Pour chacun des 10 éléments inscriptibles à l'écran
+  strcpy(Filelist->Full_name, fname+1);
-    for (index=0;index<10;index++)
-    {
-      // S'il est sélectionné:
-      if (!selector_offset)
-      {
-          text_color=MC_White;
-        background_color=MC_Light;
-      }
-      else
-      {
-          text_color=MC_Light;
-        background_color=MC_Black;
-      }
   
-      // On affiche l'élément
+  // Reformat the short name
-      Print_in_window(8,FILESEL_Y+2+index*8,current_item->Short_name,text_color,background_color);
+  strcpy(Filelist->Short_name,Format_filename(Filelist->Full_name, 0));
     
-      // On passe à la ligne suivante
-      selector_offset--;
-      current_item=current_item->Next;
-      if (!current_item)
-        break;
-    } // End de la boucle d'affichage
-
-  } // End du test d'existence de fichiers
 }
 
+T_Fileselector_item * Get_selected_skin(word index)
+{
+  T_Fileselector_item * current_item;
+  // Fast-forward to the requested item.
+  current_item=Filelist;
+  for (;index>0;index--)
+    current_item=current_item->Next;
+  // I know it's highly inefficient (O(n²)) but there shouldn't be dozens
+  // of skins in the directory...
   
+  return current_item;
+}
+
+// Callback to display a skin name in the list
+void Draw_one_skin_name(word x, word y, word index, byte highlighted)
+{
+  T_Fileselector_item * current_item;
+
+  if (Filelist_nb_elements>0)
+  {
+    current_item = Get_selected_skin(index);    
+    Print_in_window(x,y,current_item->Short_name, MC_Black, (highlighted)?MC_Dark:MC_Light);
+  }
+}
 
 /// Skin selector window
 void Button_Skins(void)
@@ -1021,16 +1011,35 @@ void Button_Skins(void)
   char  quicksearch_filename[MAX_PATH_CHARACTERS]="";
   char * most_matching_filename;
   char skinsdir[MAX_PATH_CHARACTERS];
-  DIR*  Repertoire_Courant; //Répertoire courant
+  DIR*  current_directory; //Répertoire courant
   struct dirent* entry; // Structure de lecture des éléments
   struct stat Infos_enreg;
   char * current_path;
+  static int selector_position=0;
   T_Config Config_choisie = Config;
-  T_Dropdown_button* font_dropdown;
+  T_Dropdown_button * font_dropdown;
-  T_Dropdown_button* cursor_dropdown;
+  T_Dropdown_button * cursor_dropdown;
-
+  T_List_button * skin_list;
   T_Scroller_button * file_scroller;
 
+  #define FILESEL_Y 52
+
+  // --- Read the contents of skins/ directory ------------------
+  
+  // Here we use the same data container as the fileselectors.
+  // Reinitialize the list
+  Free_fileselector_list();
+  Filelist_nb_elements=0;
+  // Browse the "skins" directory
+  strcpy(skinsdir,Data_directory);
+  strcat(skinsdir,"skins");
+  // Add each found file to the list
+  For_each_file(skinsdir, Add_skin);
+  // Sort it
+  Sort_list_of_files();
+  
+  // --------------------------------------------------------------
+
   Open_window(178,155,"Skins");
 
   // Frames
@@ -1043,75 +1052,41 @@ void Button_Skins(void)
   // Ok button
   Window_set_normal_button(6,136, 51,14,"OK"         ,0,1,SDLK_RETURN); // 1
 
-  // Fileselector
+  // List of skins
-  Window_set_special_button(9,FILESEL_Y+2,144,80); // 2
+  skin_list = Window_set_list_button(
-
+    // Fileselector
-  // Scroller du fileselector
+    Window_set_special_button(9,FILESEL_Y+2,144,80), // 2
-  file_scroller = Window_set_scroller_button(160,FILESEL_Y+1,82,1,10,0); // 3
+    // Scroller du fileselector
+    (file_scroller = Window_set_scroller_button(160,FILESEL_Y+1,82,Filelist_nb_elements,10,selector_position)), // 3
+    Draw_one_skin_name); // 4
 
   // Boutons de fontes
-  font_dropdown = Window_set_dropdown_button(60,19,70,11,0,(Config_choisie.Font==0)?"Classic":"Fun    ",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 4
+  font_dropdown = Window_set_dropdown_button(60,19,70,11,0,(Config_choisie.Font==0)?"Classic":"Fun    ",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 5
   Window_dropdown_add_item(font_dropdown,0,"Classic");
   Window_dropdown_add_item(font_dropdown,1,"Fun    ");
 
   // Cancel
-  Window_set_normal_button(62,136, 51,14,"Cancel",0,1,SDLK_ESCAPE); // 5
+  Window_set_normal_button(62,136, 51,14,"Cancel",0,1,SDLK_ESCAPE); // 6
 
   // Button item du curseur
   if(Config_choisie.Cursor==0)
-  	cursor_dropdown = Window_set_dropdown_button(60,34,104,11,0,"Solid      ",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 6
+  	cursor_dropdown = Window_set_dropdown_button(60,34,104,11,0,"Solid      ",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 7
   else if(Config_choisie.Cursor==1)
-  	cursor_dropdown = Window_set_dropdown_button(60,34,104,11,0,"Transparent",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 6
+  	cursor_dropdown = Window_set_dropdown_button(60,34,104,11,0,"Transparent",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 7
   else
-  	cursor_dropdown = Window_set_dropdown_button(60,34,104,11,0,"Thin       ",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 6
+  	cursor_dropdown = Window_set_dropdown_button(60,34,104,11,0,"Thin       ",1,0,1,RIGHT_SIDE|LEFT_SIDE); // 7
   Window_dropdown_add_item(cursor_dropdown,0,"Solid      ");
   Window_dropdown_add_item(cursor_dropdown,1,"Transparent");
   Window_dropdown_add_item(cursor_dropdown,2,"Thin       ");
 
-  strcpy(skinsdir,Data_directory);
-  strcat(skinsdir,"skins");
-  chdir(skinsdir);
-  getcwd(skinsdir,256);
-
-  // Affichage des premiers fichiers visibles:
-  // Ensuite, on vide la liste actuelle:
-  Free_fileselector_list();
-  // Après effacement, il ne reste ni fichier ni répertoire dans la liste
-  Filelist_nb_elements=0;
-
-  // On lit tous les répertoires:
-  current_path=getcwd(NULL,0);
-  Repertoire_Courant=opendir(current_path);
-  while ((entry=readdir(Repertoire_Courant)))
-  {
-    stat(entry->d_name,&Infos_enreg);
-    if (S_ISREG(Infos_enreg.st_mode) && //Il s'agit d'un fichier
-      (Config.Show_hidden_files || //Il n'est pas caché
-      !isHidden(entry)))
-    {
-        // On rajoute le fichier à la liste
-        Add_element_to_list(entry->d_name, 0);
-        Filelist_nb_elements++;
-    }
-  }
-
-  closedir(Repertoire_Courant);
-  free(current_path);
-
-  Sort_list_of_files();
-
-  file_scroller->Nb_elements=Filelist_nb_elements;
-  file_scroller->Position=Main_fileselector_position;
-  Compute_slider_cursor_height(file_scroller);
-  Window_draw_slider(file_scroller);
-
   // Select the current skin (we know it does exist, so no need to do a 
   // nearest match search)
-  Highlight_file(Config_choisie.SkinFile);
+  //Highlight_file(Config_choisie.SkinFile);
   // On efface les anciens noms de fichier:
-  Window_rectangle(8-1,FILESEL_Y-1,144+2,80+2,MC_Black);
+  //Window_rectangle(8-1,FILESEL_Y-1,144+2,80+2,MC_Black);
   // On affiche les nouveaux:
-  Display_skins_list(Main_fileselector_position,Main_fileselector_offset);
+  //Display_skins_list(Main_fileselector_position,Main_fileselector_offset);
+  Window_redraw_list(skin_list);
 
   Update_window_area(0,0,Window_width, Window_height);
 
@@ -1123,42 +1098,19 @@ void Button_Skins(void)
 
     switch(clicked_button)
     {
-	  // 1: OK
+	    case 1 : // OK
-      case 2 : // Zone d'affichage de la liste de fichiers
+	      break;
-        Hide_cursor();
+      case 2 : // doesn't happen
-
-  		temp=(((Mouse_Y-Window_pos_Y)/Menu_factor_Y)-FILESEL_Y)>>3;
-  		if (temp>=Filelist_nb_elements)
-    	temp=Filelist_nb_elements-1;
-        if (temp>=0)
-        {
-            // On met à jour le décalage
-            Main_fileselector_offset=temp;
-
-            // On affiche à nouveau la liste
-            Display_skins_list(Main_fileselector_position,Main_fileselector_offset);
-
-            // On vient de changer de nom de fichier, donc on doit s'appreter
-            // a rafficher une preview
-            *quicksearch_filename=0;
-        }
-        Display_cursor();
-        Wait_end_of_click();
         break;
-
+      case 3 : // doesn't happen
-      case 3 : // Scroller de fichiers
-        Hide_cursor();
-        Main_fileselector_position=Window_attribute2;
-        // On affiche à nouveau la liste
-        Display_skins_list(Main_fileselector_position,Main_fileselector_offset);
-        Display_cursor();
-        *quicksearch_filename=0;
         break;
-      case  4 : // Font dropdown
+      case 4 : // a file is selected
+        break;
+      case  5 : // Font dropdown
         Config_choisie.Font=Window_attribute2; // récupère le numéro de l'item selectionné
         break;
 	  // 5: Cancel
-       case 6 : // Cursor
+       case 7 : // Cursor
         Config_choisie.Cursor=Window_attribute2;
         break;
     }
@@ -1241,7 +1193,6 @@ void Button_Skins(void)
   		}
         Key=0;
         break;
-		*/
       default: // Autre => On se place sur le nom de fichier qui correspond
         if (clicked_button<=0)
         {
@@ -1273,11 +1224,12 @@ void Button_Skins(void)
         }
         else
           *quicksearch_filename=0;
+    		*/
     }
   }
-  while ( (clicked_button!=1) && (Key!=SDLK_RETURN) && (clicked_button !=5) && (Key != SDLK_ESCAPE));
+  while ( (clicked_button!=1) && (clicked_button !=6) && (Key != SDLK_ESCAPE));
 
-  if(clicked_button == 1 || Key == SDLK_RETURN)
+  if(clicked_button == 1)
   {
     T_Gui_skin * gfx = (T_Gui_skin *)malloc(sizeof(T_Gui_skin));
     if (gfx == NULL)
@@ -1286,8 +1238,10 @@ void Button_Skins(void)
     }
     else
     {
-  	  strcpy(skinsdir,"skins/");
+   	  strcpy(skinsdir,"skins/");
-  	  Get_selected_item(Main_fileselector_position,Main_fileselector_offset,skinsdir+6,NULL);
+      strcat(   	  
+   	    skinsdir,
+   	    Get_selected_skin(skin_list->List_start+skin_list->Cursor_position)->Full_name);
   	  Load_graphics(gfx, skinsdir);
   	  if (0) // Error
       {
@@ -5496,6 +5450,8 @@ void Button_Text()
   font_list->List_start = list_start;
   font_list->Cursor_position = cursor_position;
   
+  Window_redraw_list(font_list);
+  
   Update_window_area(0,0,Window_width, Window_height);
   
   // str texte

engine.c

@@ -1688,6 +1688,19 @@ T_List_button * Window_set_list_button(T_Special_button * entry_button, T_Scroll
   return temp;
 }
 
+void Window_redraw_list(T_List_button * list)
+{
+  int i;
+
+  for (i=Min(list->Scroller->Nb_visibles-1, list->Scroller->Nb_elements-1); i>=0; i--)
+  {
+    list->Draw_list_item(
+      list->Entry_button->Pos_X,
+      list->Entry_button->Pos_Y + i * 8,
+      list->List_start + i,
+      i == list->Cursor_position);
+  }
+}
 
 //----------------------- Ouverture d'un pop-up -----------------------
 
@@ -2620,8 +2633,6 @@ short Window_clicked_button(void)
           }
           else if (list->Scroller->Number == clicked_button)
           {
-            short i;
-            
             // Click in the scroller part of a list
             if (list->List_start == list->Scroller->Position)
               return 0; // Didn't actually move
@@ -2631,14 +2642,7 @@ short Window_clicked_button(void)
             list->Cursor_position -= list->List_start;
             // Need to redraw all
             Hide_cursor();
-            for (i=Min(list->Scroller->Nb_visibles-1, list->Scroller->Nb_elements-1); i>=0; i--)
+            Window_redraw_list(list);
-            {
-              list->Draw_list_item(
-                list->Entry_button->Pos_X,
-                list->Entry_button->Pos_Y + i * 8,
-                list->List_start + i,
-                i == list->Cursor_position);
-            }
             Display_cursor();
           }
         }

engine.h

@@ -72,6 +72,7 @@ T_Dropdown_button * Window_set_dropdown_button(word x_pos,word y_pos,word width,
 void Window_dropdown_add_item(T_Dropdown_button * dropdown, word btn_number, const char *label);
 void Window_dropdown_clear_items(T_Dropdown_button * dropdown);
 T_List_button * Window_set_list_button(T_Special_button * entry_button, T_Scroller_button * scroller, Func_draw_list_item draw_list_item);
+void Window_redraw_list(T_List_button * list);
 byte Window_click_in_rectangle(short start_x,short start_y,short end_x,short end_y);
 short Wait_click_in_palette(T_Palette_button * button);
 void Get_color_behind_window(byte * color, byte * click);

filesel.c

@@ -207,7 +207,7 @@ void Read_list_of_files(byte selected_format)
 //  Cette procédure charge dans la liste chainée les fichiers dont l'extension
 // correspond au format demandé.
 {
-  DIR*  Repertoire_Courant; //Répertoire courant
+  DIR*  current_directory; //Répertoire courant
   struct dirent* entry; // Structure de lecture des éléments
   char * filter = "*"; // Extension demandée
   struct stat Infos_enreg;
@@ -225,8 +225,8 @@ void Read_list_of_files(byte selected_format)
 
   // On lit tous les répertoires:
   current_path=getcwd(NULL,0);
-  Repertoire_Courant=opendir(current_path);
+  current_directory=opendir(current_path);
-  while ((entry=readdir(Repertoire_Courant)))
+  while ((entry=readdir(current_directory)))
   {
     // On ignore le répertoire courant
     if ( !strcmp(entry->d_name, "."))
@@ -264,7 +264,7 @@ void Read_list_of_files(byte selected_format)
   Filelist_nb_directories ++;
 #endif
 
-  closedir(Repertoire_Courant);
+  closedir(current_directory);
   free(current_path);
 
   Filelist_nb_elements=Filelist_nb_directories+Filelist_nb_files;

io.c

@@ -243,16 +243,16 @@ int File_length_file(FILE * file)
 void For_each_file(const char * directory_name, void Callback(const char *))
 {
   // Pour scan de répertoire
-  DIR*  Repertoire_Courant; //Répertoire courant
+  DIR*  current_directory; //Répertoire courant
   struct dirent* entry; // Structure de lecture des éléments
   char full_filename[MAX_PATH_CHARACTERS];
   int filename_position;
   strcpy(full_filename, directory_name);
-  Repertoire_Courant=opendir(directory_name);
+  current_directory=opendir(directory_name);
-  if(Repertoire_Courant == NULL) return;        // Répertoire invalide ...
+  if(current_directory == NULL) return;        // Répertoire invalide ...
   strcat(full_filename, PATH_SEPARATOR);
   filename_position = strlen(full_filename);
-  while ((entry=readdir(Repertoire_Courant)))
+  while ((entry=readdir(current_directory)))
   {
     struct stat Infos_enreg;
     strcpy(&full_filename[filename_position], entry->d_name);
@@ -262,6 +262,6 @@ void For_each_file(const char * directory_name, void Callback(const char *))
       Callback(full_filename);
     }
   }
-  closedir(Repertoire_Courant);
+  closedir(current_directory);
 }