Ticket #10: Work_in_progress_issue10.patch

filesel.c

@@ -81 +81 @@
 #define SELECTED_BACKGROUND_COLOR       MC_Dark // color du fond  pour une ligne
   // sélectionnée
 
+#define TOCODE   "CP1252"
+#define FROMCODE "UTF-8"
+static iconv_t cd = (iconv_t)-1;  // utilisé pour convertir les noms de fichiers
+
 // -- Native fileselector for WIN32
 
 // Returns 0 if all ok, something else if failed
@@ -230 +234 @@
   int         c;
   int         other_cursor;
   int         pos_last_dot;
+  char        converted_fname[MAX_PATH_CHARACTERS];
 
+  {
+    char * input = (char *)fname;
+    size_t inbytesleft = strlen(fname);
+    char * output = converted_fname;
+    size_t outbytesleft = sizeof(converted_fname)-1;
+    if(cd == (iconv_t)-1)
+      cd = iconv_open(TOCODE, FROMCODE);
+    if((ssize_t)iconv(cd, &input, &inbytesleft, &output, &outbytesleft) >= 0)
+    {
+      *output = '\0';
+      fname = converted_fname;
+    }
+  }
   // safety
   if (max_length>40)
     max_length=40;
@@ -1064 +1082 @@
 // Affiche Selector->Directory sur 37 caractères
 //
 {
+  char converted_name[MAX_PATH_CHARACTERS];
   char temp_name[MAX_DISPLAYABLE_PATH+1]; // Nom tronqué
   int  length; // length du répertoire courant
   int  index;   // index de parcours de la chaine complète
 
+  strncpy(converted_name,Selector->Directory,sizeof(converted_name));
+  converted_name[sizeof(converted_name)-1] = '\0';
+  {
+    char * input = Selector->Directory;
+    size_t inbytesleft = strlen(input);
+    char * output = converted_name;
+    size_t outbytesleft = sizeof(converted_name)-1;
+    if(cd == (iconv_t)-1)
+      cd = iconv_open(TOCODE, FROMCODE);
+    if((ssize_t)iconv(cd, &input, &inbytesleft, &output, &outbytesleft) >= 0)
+    {
+      *output = '\0';
+    }
+  }
+
   Window_rectangle(10,84,37*8,8,MC_Light);
 
-  length=strlen(Selector->Directory);
+  length=strlen(converted_name);
   if (length>MAX_DISPLAYABLE_PATH)
   { // Doh! il va falloir tronquer le répertoire (bouh !)
 
     // On commence par copier bêtement les 3 premiers caractères (e.g. "C:\")
     for (index=0;index<3;index++)
-      temp_name[index]=Selector->Directory[index];
+      temp_name[index]=converted_name[index];
 
     // On y rajoute 3 petits points:
     strcpy(temp_name+3,"...");
@@ -1084 +1118 @@
     //  Ensuite, on cherche un endroit à partir duquel on pourrait loger tout
     // le reste de la chaine (Ouaaaaaah!!! Vachement fort le mec!!)
     for (index++;index<length;index++)
-      if ( (Selector->Directory[index]==PATH_SEPARATOR[0]) &&
+      if ( (converted_name[index]==PATH_SEPARATOR[0]) &&
            (length-index<=MAX_DISPLAYABLE_PATH-6) )
       {
         // Ouf: on vient de trouver un endroit dans la chaîne à partir duquel
         // on peut faire la copie:
-        strcpy(temp_name+6,Selector->Directory+index);
+        strcpy(temp_name+6,converted_name+index);
         break;
       }
 
@@ -1097 +1131 @@
     Print_in_window(10,84,temp_name,MC_Black,MC_Light);
   }
   else // Ahhh! La chaîne peut loger tranquillement dans la fenêtre
-    Print_in_window(10,84,Selector->Directory,MC_Black,MC_Light);
+    Print_in_window(10,84,converted_name,MC_Black,MC_Light);
     
   Update_window_area(10,84,37*8,8);
 }
@@ -1107 +1141 @@
 //
 void Print_filename_in_fileselector(void)
 {
+  char filename[32];
+  strncpy(filename, Selector_filename, sizeof(filename));
+  {
+    char * input = (char *)Selector_filename;
+    size_t inbytesleft = strlen(Selector_filename);
+    char * output = filename;
+    size_t outbytesleft = sizeof(filename)-1;
+    if(cd == (iconv_t)-1)
+      cd = iconv_open(TOCODE, FROMCODE);
+    if((ssize_t)iconv(cd, &input, &inbytesleft, &output, &outbytesleft) >= 0)
+    {
+      *output = '\0';
+    }
+  }
   Window_rectangle(82,48,27*8,8,MC_Light);
-  Print_in_window_limited(82,48,Selector_filename,27,MC_Black,MC_Light);
+  Print_in_window_limited(82,48,filename,27,MC_Black,MC_Light);
   Update_window_area(82,48,27*8,8);
 }