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

store unicode filename for brush

Browse Source
This commit is contained in:
Thomas Bernard 2018-11-09 10:59:49 +01:00
parent 907da28911
commit 50f3b99106
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buttons.c
View File

@ -3166,7 +3166,7 @@ void Load_picture(enum CONTEXT_TYPE type)
break; break;
case CONTEXT_BRUSH: case CONTEXT_BRUSH:
strcpy(filename, Brush_filename); strcpy(filename, Brush_filename);
filename_unicode[0] = 0; Unicode_strlcpy(filename_unicode, Brush_filename_unicode, MAX_PATH_CHARACTERS);
strcpy(directory, Brush_file_directory); strcpy(directory, Brush_file_directory);
Init_context_brush(&context, filename, directory); Init_context_brush(&context, filename, directory);
selector = &Brush_selector; selector = &Brush_selector;
@ -3215,6 +3215,7 @@ void Load_picture(enum CONTEXT_TYPE type)
if (type==CONTEXT_BRUSH) if (type==CONTEXT_BRUSH)
{ {
strcpy(Brush_filename, context.File_name); strcpy(Brush_filename, context.File_name);
Unicode_strlcpy(Brush_filename_unicode, context.File_name_unicode, MAX_PATH_CHARACTERS);
strcpy(Brush_file_directory, context.File_directory); strcpy(Brush_file_directory, context.File_directory);
Brush_fileformat = context.Format; Brush_fileformat = context.Format;
@ -3479,8 +3480,8 @@ void Save_picture(enum CONTEXT_TYPE type)
else if (type == CONTEXT_BRUSH) else if (type == CONTEXT_BRUSH)
{ {
strcpy(filename, Brush_filename); strcpy(filename, Brush_filename);
Unicode_strlcpy(filename_unicode, Brush_filename_unicode, MAX_PATH_CHARACTERS);
strcpy(directory, Brush_file_directory); strcpy(directory, Brush_file_directory);
filename_unicode[0] = 0;
Init_context_brush(&save_context, filename, directory); Init_context_brush(&save_context, filename, directory);
save_context.Format = Brush_fileformat; save_context.Format = Brush_fileformat;
selector = &Brush_selector; selector = &Brush_selector;
@ -3551,6 +3552,7 @@ void Save_picture(enum CONTEXT_TYPE type)
{ {
Brush_fileformat=save_context.Format; Brush_fileformat=save_context.Format;
strcpy(Brush_filename, save_context.File_name); strcpy(Brush_filename, save_context.File_name);
Unicode_strlcpy(Brush_filename_unicode, save_context.File_name_unicode, MAX_PATH_CHARACTERS);
strcpy(Brush_file_directory, save_context.File_directory); strcpy(Brush_file_directory, save_context.File_directory);
} }
Hide_cursor(); Hide_cursor();

2
src/global.h
View File

@ -338,6 +338,8 @@ GFX2_GLOBAL word Brush_height;
GFX2_GLOBAL char Brush_file_directory[MAX_PATH_CHARACTERS]; GFX2_GLOBAL char Brush_file_directory[MAX_PATH_CHARACTERS];
/// Filename (without directory) of the brush (after loading or saving it). /// Filename (without directory) of the brush (after loading or saving it).
GFX2_GLOBAL char Brush_filename[MAX_PATH_CHARACTERS]; GFX2_GLOBAL char Brush_filename[MAX_PATH_CHARACTERS];
/// Filename (without directory) of the brush (after loading or saving it) unicode.
GFX2_GLOBAL word Brush_filename_unicode[MAX_PATH_CHARACTERS];
/// File format of the brush. It's a value of enum ::FILE_FORMATS /// File format of the brush. It's a value of enum ::FILE_FORMATS
GFX2_GLOBAL byte Brush_fileformat; GFX2_GLOBAL byte Brush_fileformat;
/// Fileselector settings /// Fileselector settings

1
src/main.c
View File

@ -727,6 +727,7 @@ int Init_program(int argc,char * argv[])
strcpy(Brush_selector.Directory,Main.selector.Directory); strcpy(Brush_selector.Directory,Main.selector.Directory);
strcpy(Brush_file_directory,Main.selector.Directory); strcpy(Brush_file_directory,Main.selector.Directory);
strcpy(Brush_filename ,"NO_NAME.GIF"); strcpy(Brush_filename ,"NO_NAME.GIF");
Brush_filename_unicode[0] = 0;
Brush_fileformat =DEFAULT_FILEFORMAT; Brush_fileformat =DEFAULT_FILEFORMAT;
strcpy(Palette_selector.Directory,Main.selector.Directory); strcpy(Palette_selector.Directory,Main.selector.Directory);