Aren/kolibrios
1
0
Fork 0
mirror of https://github.com/KolibriOS/kolibrios.git synced 2025-01-07 06:02:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Dicty 1.32: don't use old function SetWorkingFolder, fix regression in strttl()

Browse Source 
git-svn-id: svn://kolibrios.org@5423 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-02-18 20:49:48 +00:00
parent 26dd723140
commit 00fbb27b5a
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
programs/cmm/dicty/dicty.c
View File

@ -9,7 +9,7 @@
unsigned char speaker[23*40*3]= FROM "speaker.raw"; unsigned char speaker[23*40*3]= FROM "speaker.raw";
char title[]= "Dictionary v1.31"; char title[]= "Dictionary v1.32";
char direction[] = "Translate direction:"; char direction[] = "Translate direction:";
char translate_caption[] = "Translate"; char translate_caption[] = "Translate";
char dict_not_found[] = "Dictionary not found"; char dict_not_found[] = "Dictionary not found";
@ -20,7 +20,8 @@ char empty_word[] = "Type a word to translate";
system_colors sc; system_colors sc;
proc_info Form; proc_info Form;
char edword[256], search_word[256], translate_result[4096], dict_folder[4096], cur_dict[256]; char edword[256], search_word[256], translate_result[4096], cur_dict[256];
dword dict_folder;
#define DICT_DIRECROTY "dictionaries" #define DICT_DIRECROTY "dictionaries"
#define PRONOUNCED_FILE "/sys/pronounced.txt" #define PRONOUNCED_FILE "/sys/pronounced.txt"
#define SPEECH_PATH "/kolibrios/media/speech/speech" #define SPEECH_PATH "/kolibrios/media/speech/speech"
@ -36,10 +37,7 @@ void main()
mem_Init(); mem_Init();
if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/boxlib.obj"); if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/boxlib.obj");
program_path[strrchr(#program_path, '/')] = 0; dict_folder = abspath(DICT_DIRECROTY);
strcpy(#dict_folder, #program_path);
strcat(#dict_folder, DICT_DIRECROTY);
SetCurDir(#dict_folder);
OpenDictionary(0); OpenDictionary(0);
if (param) if (param)
@ -95,7 +93,8 @@ void main()
EAX=key<<8; EAX=key<<8;
edit_box_key stdcall(#edit1); edit_box_key stdcall(#edit1);
//LiveSearch(); // Translate();
// DrawTranslation();
break; break;
case evReDraw: case evReDraw:
@ -200,6 +199,7 @@ void Translate()
void OpenDictionary(dword fileid) void OpenDictionary(dword fileid)
{ {
char open_file_path[4096];
KillProcess(speaker_id); KillProcess(speaker_id);
if (!dir_buf) ShowDictList(); if (!dir_buf) ShowDictList();
if (!dir_buf) strcpy(#cur_dict, "none"); if (!dir_buf) strcpy(#cur_dict, "none");
@ -208,18 +208,22 @@ void OpenDictionary(dword fileid)
free(file_buf); free(file_buf);
file_buf = malloc(fsize); file_buf = malloc(fsize);
ReadFile(0, fsize, file_buf, #cur_dict); strcpy(#open_file_path, dict_folder);
strcat(#open_file_path, "/");
strcat(#open_file_path, #cur_dict);
ReadFile(0, fsize, file_buf, #open_file_path);
IF (EAX<>0) IF (EAX<>0)
{ {
fsize = 0; fsize = 0;
strcpy(#search_word, "Error #"); strcpy(#search_word, "Error #");
strcat(#search_word, itoa(EAX)); strcat(#search_word, itoa(EAX));
strcpy(#translate_result, #dict_not_found); strcpy(#translate_result, #dict_not_found);
DrawWindowContent();
return;
} }
else
{
strcpy(#search_word, #cur_dict); strcpy(#search_word, #cur_dict);
strcpy(#translate_result, #dict_opened); strcpy(#translate_result, #dict_opened);
}
DrawWindowContent(); DrawWindowContent();
} }
@ -229,7 +233,7 @@ void ShowDictList()
int j, fcount, error; int j, fcount, error;
free(dir_buf); free(dir_buf);
error = GetDir(#dir_buf, #fcount, #dict_folder, DIRS_ONLYREAL); error = GetDir(#dir_buf, #fcount, dict_folder, DIRS_ONLYREAL);
if (!error) if (!error)
{ {
DefineButton(0,0, Form.width,Form.height, 12+BT_HIDE+BT_NOFRAME, sc.work_button); DefineButton(0,0, Form.width,Form.height, 12+BT_HIDE+BT_NOFRAME, sc.work_button);

15
programs/cmm/lib/strings.h
View File

@ -272,7 +272,7 @@ unsigned int strcpyb(dword search_in, copyin, startstr, endstr)
} }
/*void strcat(char *to, char *from) //òîæå ðàáîòàåò /*void strcat(char *to, char *from)
{ {
while(*to) to++; while(*to) to++;
while(*from) while(*from)
@ -313,8 +313,8 @@ inline fastcall strupr( ESI)
do{ do{
AL=DSBYTE[ESI]; AL=DSBYTE[ESI];
IF(AL>='a')IF(AL<='z')DSBYTE[ESI]=AL&0x5f; IF(AL>='a')IF(AL<='z')DSBYTE[ESI]=AL&0x5f;
IF (AL>=160) && (AL<=175) DSBYTE[ESI] = AL - 32; //à-ï IF (AL>=160) && (AL<=175) DSBYTE[ESI] = AL - 32; //à-ï
IF (AL>=224) && (AL<=239) DSBYTE[ESI] = AL - 80; //à-ï IF (AL>=224) && (AL<=239) DSBYTE[ESI] = AL - 80; //à-ï
ESI++; ESI++;
}while(AL!=0); }while(AL!=0);
} }
@ -335,17 +335,18 @@ inline fastcall strttl( EDX)
{ {
AL=DSBYTE[EDX]; AL=DSBYTE[EDX];
IF(AL>='a')&&(AL<='z')DSBYTE[EDX]=AL&0x5f; IF(AL>='a')&&(AL<='z')DSBYTE[EDX]=AL&0x5f;
IF (AL>=160) && (AL<=175) DSBYTE[EDX] = AL - 32; //à-ï IF (AL>=160) && (AL<=175) DSBYTE[EDX] = AL - 32; //à-ï
IF (AL>=224) && (AL<=239) DSBYTE[EDX] = AL - 80; //à-ï IF (AL>=224) && (AL<=239) DSBYTE[EDX] = AL - 80; //à-ï
do{ do{
EDX++; EDX++;
AL=DSBYTE[EDX]; AL=DSBYTE[EDX];
IF(AL>='A')&&(AL<='Z'){DSBYTE[EDX]=AL|0x20; CONTINUE;} IF(AL>='A')&&(AL<='Z'){DSBYTE[EDX]=AL|0x20; CONTINUE;}
IF(AL>='€')&&(AL<='')DSBYTE[EDX]=AL|0x20; // -¯ IF(AL>='€')&&(AL<='<EFBFBD>')DSBYTE[EDX]=AL|0x20; // -¯
IF (AL>=144) && (AL<=159) DSBYTE[EDX] = AL + 80; //à-ï IF (AL>=144) && (AL<=159) DSBYTE[EDX] = AL + 80; //à-ï
}while(AL!=0); }while(AL!=0);
} }
dword itoa( ESI) dword itoa( ESI)
{ {
unsigned char buffer[11]; unsigned char buffer[11];