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

Make the quick search work with unicode characters

Browse Source
This commit is contained in:
Thomas Bernard 2018-12-08 15:17:40 +01:00
parent 7e3e39a753
commit 49b7d1017e
1 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/filesel.c
View File

@ -50,6 +50,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <ctype.h> #include <ctype.h>
#include <wctype.h>
#include <sys/types.h> #include <sys/types.h>
#include "const.h" #include "const.h"
@ -1451,7 +1452,11 @@ static void Highlight_file(short index)
} }
short Find_filename_match(T_Fileselector *list, char * fname) /// Find the item best matching the searched filename
///
/// used by quicksearch
/// @return -1 if not matching name found
static short Find_filename_match(const T_Fileselector *list, const word * fname)
{ {
short best_match; short best_match;
T_Fileselector_item * current_item; T_Fileselector_item * current_item;
@ -1468,7 +1473,22 @@ short Find_filename_match(T_Fileselector *list, char * fname)
|| (Config.Find_file_fast==(current_item->Type+1)) ) || (Config.Find_file_fast==(current_item->Type+1)) )
{ {
// On compare et si c'est mieux, on stocke dans Meilleur_nom // On compare et si c'est mieux, on stocke dans Meilleur_nom
for (counter=0; fname[counter]!='\0' && tolower(current_item->Full_name[counter])==tolower(fname[counter]); counter++); if (current_item->Unicode_full_name != NULL)
{
for (counter = 0; fname[counter] != 0; counter++)
{
if (towlower(current_item->Unicode_full_name[counter]) != towlower(fname[counter]))
break;
}
}
else
{
for (counter=0; fname[counter] != 0; counter++)
{
if (tolower(current_item->Full_name[counter] != towlower(fname[counter])))
break;
}
}
if (counter>matching_letters) if (counter>matching_letters)
{ {
matching_letters=counter; matching_letters=counter;
@ -1482,30 +1502,39 @@ short Find_filename_match(T_Fileselector *list, char * fname)
} }
// Quicksearch system // Quicksearch system
char quicksearch_filename[MAX_PATH_CHARACTERS]=""; #define MAX_QUICKSEARCH_LEN 50
/// Current quicksearch string
static word quicksearch_filename[MAX_QUICKSEARCH_LEN+1] = { 0 };
/// Reset the current quicksearch string
void Reset_quicksearch(void) void Reset_quicksearch(void)
{ {
quicksearch_filename[0]='\0'; quicksearch_filename[0] = 0;
} }
short Quicksearch(T_Fileselector *selector) /// Select the item based on what the user type
static short Quicksearch(const T_Fileselector *selector)
{ {
int len; word key;
size_t len;
short most_matching_item; short most_matching_item;
// Autre => On se place sur le nom de fichier qui correspond // Go to the filename which matches what is typed
len=strlen(quicksearch_filename); len = Unicode_strlen(quicksearch_filename);
if (Key_ANSI>= ' ' && Key_ANSI < 255 && len<50) key = Key_UNICODE;
if (key == 0)
key = Key_ANSI;
if (key >= ' ' && len < MAX_QUICKSEARCH_LEN)
{ {
quicksearch_filename[len]=Key_ANSI; quicksearch_filename[len] = key;
quicksearch_filename[len+1]='\0'; quicksearch_filename[len+1] = 0;
most_matching_item=Find_filename_match(selector, quicksearch_filename); most_matching_item = Find_filename_match(selector, quicksearch_filename);
if ( most_matching_item >= 0 ) if ( most_matching_item >= 0 )
{
return most_matching_item; return most_matching_item;
} else
*quicksearch_filename=0; Reset_quicksearch();
} }
return -1; return -1;
} }