m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort_list_of_files(): sort based on Unicode filename if available

Browse Source 
This fix the problem with Win32 where the sorting was
done based on the "short filenames" such as
EXAMPLE~1.PNG, EXAMPLE~2.PNG, etc.
This commit is contained in:
Thomas Bernard 2019-03-20 14:16:23 +01:00
parent 0bf0d9b219
commit b49fa1dfcc
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/filesel.c
View File

@ -42,6 +42,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <stdio.h> #include <stdio.h>
#define strdup _strdup #define strdup _strdup
#define wcsicmp _wcsicmp
#if _MSC_VER < 1900 #if _MSC_VER < 1900
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
@ -822,9 +823,11 @@ void Read_list_of_drives(T_Fileselector *list, byte name_length)
#ifdef WIN32 #ifdef WIN32
// case-insensitive // case-insensitive
#define FILENAME_COMPARE strcasecmp #define FILENAME_COMPARE strcasecmp
#define FILENAME_COMPARE_UNICODE wcsicmp
#else #else
// case-sensitive // case-sensitive
#define FILENAME_COMPARE strcmp #define FILENAME_COMPARE strcmp
#define FILENAME_COMPARE_UNICODE wcscmp
#endif #endif
@ -871,12 +874,25 @@ void Sort_list_of_files(T_Fileselector *list)
// If both elements have the same type, compare the file names, if // If both elements have the same type, compare the file names, if
// current is alphabetically before, we need to swap, unless it is // current is alphabetically before, we need to swap, unless it is
// parent directory, which should always go first // parent directory, which should always go first
else if ( (current_item->Type==next_item->Type) && else if (current_item->Type == next_item->Type)
(((FILENAME_COMPARE(current_item->Full_name,next_item->Full_name)>0) && {
(FILENAME_COMPARE(current_item->Full_name, PARENT_DIR) != 0)) || if (FILENAME_COMPARE(next_item->Full_name, PARENT_DIR) == 0)
(FILENAME_COMPARE(next_item->Full_name, PARENT_DIR) == 0)) need_swap = 1;
) else if (FILENAME_COMPARE(current_item->Full_name, PARENT_DIR) != 0)
need_swap=1; {
if (current_item->Unicode_full_name != NULL && next_item->Unicode_full_name != NULL)
{
// compare unicode file names if they are available
if (FILENAME_COMPARE_UNICODE(current_item->Unicode_full_name, next_item->Unicode_full_name) > 0)
need_swap = 1;
}
else
{
if (FILENAME_COMPARE(current_item->Full_name, next_item->Full_name) > 0)
need_swap = 1;
}
}
}
if (need_swap) if (need_swap)