Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: utfconv library had some quite confusing formatting, also cleared som warnings.

Browse Source
This commit is contained in:
Campbell Barton
2012-04-12 02:15:33 +00:00
parent 5aaf3ede76
commit cc1259178b
12 changed files with 270 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/CMakeLists.txt
View File

@@ -66,8 +66,7 @@ if(WITH_CYCLES)
add_subdirectory(cycles)
endif()
#Only Windows needs utf16 converter
# only windows needs utf16 converter
if(WIN32)
add_subdirectory(utfconv)
endif()

2
intern/SConscript
View File

@@ -3,7 +3,7 @@ Import ('env')
SConscript(['audaspace/SConscript',
'string/SConscript',
'utfconv/SConscript',
'utfconv/SConscript', # XXX - why use this on UNIX?
'ghost/SConscript',
'guardedalloc/SConscript',
'moto/SConscript',

4
intern/ghost/intern/GHOST_SystemPathsWin32.cpp
View File

@@ -117,7 +117,7 @@ const GHOST_TUns8* GHOST_SystemPathsWin32::getBinaryDir() const
void GHOST_SystemPathsWin32::addToSystemRecentFiles(const char *filename) const
{
/* SHARD_PATH resolves to SHARD_PATHA for non-UNICODE build */
UTF16_ENCODE(filename)
UTF16_ENCODE(filename);
SHAddToRecentDocs(SHARD_PATHW, filename_16);
UTF16_UN_ENCODE(filename)
UTF16_UN_ENCODE(filename);
}

27
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@@ -726,17 +726,23 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, RAWINP
int r;
GetKeyboardState((PBYTE)state);
if(r = ToUnicodeEx(vk, 0, state, utf16, 2, 0, system->m_keylayout))
if(r = ToUnicodeEx(vk, 0, state, utf16, 2, 0, system->m_keylayout)) {
if((r>0 && r<3)){
utf16[r]=0;
conv_utf_16_to_8(utf16,utf8_char,6);
}
else if (r==-1) {
utf8_char[0] = '\0';
}
}
if((r>0 && r<3)){utf16[r]=0;
conv_utf_16_to_8(utf16,utf8_char,6);}
else if (r==-1) utf8_char[0] = '\0';
if(!keyDown) {utf8_char[0] = '\0'; ascii='\0';}
else ascii = utf8_char[0]& 0x80?'?':utf8_char[0];
if(!keyDown) {
utf8_char[0] = '\0';
ascii='\0';
}
else {
ascii = utf8_char[0]& 0x80?'?' : utf8_char[0];
}
if(0x80&state[VK_MENU]) utf8_char[0]='\0';
@@ -1253,7 +1259,6 @@ GHOST_TUns8* GHOST_SystemWin32::getClipboard(bool selection) const
if ( IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL) ) {
wchar_t *buffer;
size_t len = 0;
HANDLE hData = GetClipboardData( CF_UNICODETEXT );
if (hData == NULL) {
CloseClipboard();

18
intern/utfconv/CMakeLists.txt
View File

@@ -1,3 +1,21 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(INC
.
)

45
intern/utfconv/utf_winfunc.c
View File

@@ -41,16 +41,18 @@ FILE * ufopen(const char * filename, const char * mode)
UTF16_ENCODE(filename);
UTF16_ENCODE (mode);
if(filename_16 && mode_16) f = _wfopen(filename_16, mode_16);
if(filename_16 && mode_16) {
f = _wfopen(filename_16, mode_16);
}
UTF16_UN_ENCODE(mode);
UTF16_UN_ENCODE(filename);
if(!f)
{
if(f=fopen(filename,mode))
if (!f) {
if ((f = fopen(filename, mode))) {
printf("WARNING: %s is not utf path. Please update it.\n",filename);
}
}
return f;
}
@@ -60,15 +62,17 @@ int uopen(const char *filename, int oflag, int pmode)
int f = -1;
UTF16_ENCODE(filename);
if(filename_16) f = _wopen(filename_16, oflag, pmode);
if (filename_16) {
f = _wopen(filename_16, oflag, pmode);
}
UTF16_UN_ENCODE(filename);
if(f==-1)
{
if((f=open(filename,oflag, pmode))!=-1)
if (f == -1) {
if ((f=open(filename,oflag, pmode)) != -1) {
printf("WARNING: %s is not utf path. Please update it.\n",filename);
}
}
return f;
}
@@ -104,8 +108,10 @@ char * u_alloc_getenv(const char *varname)
char * r = 0;
wchar_t * str;
UTF16_ENCODE(varname);
if(varname_16){ str = _wgetenv(varname_16);
r = alloc_utf_8_from_16(str,0);}
if (varname_16) {
str = _wgetenv(varname_16);
r = alloc_utf_8_from_16(str, 0);
}
UTF16_UN_ENCODE(varname);
return r;
@@ -122,8 +128,7 @@ int uput_getenv(const char *varname, char * value, size_t buffsize)
if(!buffsize) return r;
UTF16_ENCODE(varname);
if(varname_16)
{
if(varname_16) {
str = _wgetenv(varname_16);
conv_utf_16_to_8(str, value, buffsize);
r = 1;
@@ -135,22 +140,18 @@ int uput_getenv(const char *varname, char * value, size_t buffsize)
return r;
}
int uputenv(const char *name, const char *value)
{
int r = -1;
UTF16_ENCODE(name)
UTF16_ENCODE(value)
UTF16_ENCODE(name);
UTF16_ENCODE(value);
if(name_16 && value_16) {
if(SetEnvironmentVariableW(name_16,value_16)!=0)
r =0;
else r = -1;
r = (SetEnvironmentVariableW(name_16,value_16)!= 0) ? 0 : -1;
}
UTF16_UN_ENCODE(value)
UTF16_UN_ENCODE(name)
UTF16_UN_ENCODE(value);
UTF16_UN_ENCODE(name);
return r;
}
#endif
#endif /* WIN32 */

147
intern/utfconv/utfconv.c
View File

@@ -30,21 +30,44 @@ size_t count_utf_8_from_16(const wchar_t * string16)
int i;
size_t count = 0;
wchar_t u = 0;
if(!string16) return 0;
if (!string16) {
return 0;
}
for(i=0;u = string16[i];i++)
{
if(u < 0x0080) count+=1; else
if(u < 0x0800) count+=2; else
if(u < 0xD800) count+=3; else
for (i = 0; u = string16[i]; i++) {
if (u < 0x0080) {
count += 1;
}
else {
if (u < 0x0800) {
count += 2;
}
else {
if (u < 0xD800) {
count += 3;
}
else {
if (u < 0xDC00) {
i++;
if((u = string16[i])==0) break;
if(u >= 0xDC00 && u < 0xE000)count+=4;
} else
if(u < 0xE000) /*illigal*/; else
if ((u = string16[i]) == 0) {
break;
}
if (u >= 0xDC00 && u < 0xE000) {
count += 4;
}
}
else {
if (u < 0xE000) {
/*illigal*/;
}
else {
count += 3;
}
}
}
}
}
}
return ++count;
}
@@ -59,35 +82,36 @@ size_t count_utf_16_from_8(const char * string8)
if (!string8) return 0;
for(;(u = *string8);string8++)
{
if(type==0)
{
for (; (u = *string8); string8++) {
if (type == 0) {
if ((u & 0x01 << 7) == 0) { count++; u32 = 0; continue; } //1 utf-8 char
if ((u & 0x07 << 5) == 0xC0) { type = 1; u32 = u & 0x1F; continue; } //2 utf-8 char
if ((u & 0x0F << 4) == 0xE0) { type = 2; u32 = u & 0x0F; continue; } //3 utf-8 char
if ((u & 0x1F << 3) == 0xF0) { type = 3; u32 = u & 0x07; continue; } //4 utf-8 char
continue;
} else
{
if((u & 0xC0) == 0x80) {u32=(u32<<6) | (u&0x3F); type--;} else
{u32 = 0; type = 0;};
}
if(type==0)
{
if((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) count++; else
if(0x10000 <= u32 && u32 < 0x110000) count+=2;
else {
if ((u & 0xC0) == 0x80) {
u32 = (u32 << 6) | (u & 0x3F);
type--;
}
else {
u32 = 0;
type = 0;
}
}
if (type == 0) {
if ((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) count++;
else if (0x10000 <= u32 && u32 < 0x110000) count += 2;
u32 = 0;
}
}
return ++count;
}
int conv_utf_16_to_8(const wchar_t *in16, char *out8, size_t size8)
{
char *out8end = out8 + size8;
@@ -96,26 +120,26 @@ int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8)
if (!size8 || !in16 || !out8) return UTF_ERROR_NULL_IN;
out8end--;
for(; out8 < out8end && (u=*in16); in16++, out8++)
{
if(u < 0x0080) *out8 = u; else
if(u < 0x0800) {
for (; out8 < out8end && (u = *in16); in16++, out8++) {
if (u < 0x0080) {
*out8 = u;
}
else if (u < 0x0800) {
if (out8 + 1 >= out8end) break;
*out8++ = (0x3 << 6) | (0x1F & (u >> 6));
*out8 = (0x1 << 7) | (0x3F & (u));
}else
if(u < 0xD800 || u >= 0xE000) {
}
else if (u < 0xD800 || u >= 0xE000) {
if (out8 + 2 >= out8end) break;
*out8++ = (0x7 << 5) | (0xF & (u >> 12));
*out8++ = (0x1 << 7) | (0x3F & (u >> 6));;
*out8 = (0x1 << 7) | (0x3F & (u));
}else
if(u < 0xDC00) {
}
else if (u < 0xDC00) {
wchar_t u2 = *++in16;
if (!u2) break;
if(u2 >= 0xDC00 && u2 < 0xE000)
{
if (u2 >= 0xDC00 && u2 < 0xE000) {
if (out8 + 3 >= out8end) break; else {
unsigned int uc = 0x10000 + (u2 - 0xDC00) + ((u - 0xD800) << 10);
@@ -124,11 +148,14 @@ int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8)
*out8++ = (0x1 << 7) | (0x3F & (uc >> 6));
*out8 = (0x1 << 7) | (0x3F & (uc));
}
} else {out8--; err|=UTF_ERROR_ILLCHAR;};
} else
if(u < 0xE000) {out8--; err|=UTF_ERROR_ILLCHAR;}
}
else {
out8--; err |= UTF_ERROR_ILLCHAR;
}
}
else if (u < 0xE000) {
out8--; err |= UTF_ERROR_ILLCHAR;
}
}
*out8 = *out8end = 0;
@@ -149,31 +176,37 @@ int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16)
if (!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN;
out16end--;
for(;out16<out16end && (u = *in8);in8++)
{
if(type==0)
{
for (; out16 < out16end && (u = *in8); in8++) {
if (type == 0) {
if ((u & 0x01 << 7) == 0) { *out16 = u; out16++; u32 = 0; continue; } //1 utf-8 char
if ((u & 0x07 << 5) == 0xC0) { type = 1; u32 = u & 0x1F; continue; } //2 utf-8 char
if ((u & 0x0F << 4) == 0xE0) { type = 2; u32 = u & 0x0F; continue; } //3 utf-8 char
if ((u & 0x1F << 3) == 0xF0) { type = 3; u32 = u & 0x07; continue; } //4 utf-8 char
err|=UTF_ERROR_ILLCHAR; continue;
} else
{
if((u & 0xC0) == 0x80) {u32=(u32<<6) | (u&0x3F); type--;} else
{u32 = 0; type = 0; err|=UTF_ERROR_ILLSEQ;};
err |= UTF_ERROR_ILLCHAR;
continue;
}
if(type==0)
{
if((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) {*out16=u32; out16++;}else
if(0x10000 <= u32 && u32 < 0x110000) {
else {
if ((u & 0xC0) == 0x80) {
u32 = (u32 << 6) | (u & 0x3F);
type--;
}
else {
u32 = 0; type = 0; err |= UTF_ERROR_ILLSEQ;
}
}
if (type == 0) {
if ((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) {
*out16 = u32;
out16++;
}
else if (0x10000 <= u32 && u32 < 0x110000) {
if (out16 + 1 >= out16end) break;
u32 -= 0x10000;
*out16 = 0xD800 + (u32 >> 10);
out16++;
*out16 = 0xDC00 + (u32 & 0x3FF);
out16++;
};
}
u32 = 0;
}
@@ -188,7 +221,7 @@ int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16)
int is_ascii(const char *in8)
{
for(in8; *in8; in8++)
for (; *in8; in8++)
if (0x80 & *in8) return 0;
return 1;
@@ -196,16 +229,11 @@ int is_ascii(const char * in8)
void utf_8_cut_end(char *inout8, size_t maxcutpoint)
{
const char * start = inout8;
char *cur = inout8 + maxcutpoint;
char cc;
if (!inout8) return;
cc = *cur;
}
@@ -229,4 +257,3 @@ wchar_t * alloc_utf16_from_8(const char * in8, size_t add)
conv_utf_8_to_16(in8, out16, bsize);
return out16;
}

4
intern/utfconv/utfconv.h
View File

@@ -92,10 +92,10 @@ wchar_t * alloc_utf16_from_8(const char * in8, size_t add);
/* Easy allocation and conversion of new utf-16 string. New string has _16 suffix. Must be deallocated with UTF16_UN_ENCODE in right order*/
#define UTF16_ENCODE(in8str) if (1) { \
wchar_t * in8str ## _16 = alloc_utf16_from_8((char*)in8str, 0);
wchar_t *in8str ## _16 = alloc_utf16_from_8((char *)in8str, 0)
#define UTF16_UN_ENCODE(in8str) \
free(in8str ## _16 ); };
free(in8str ## _16); } (void)0
#ifdef __cplusplus
}

28
source/blender/blenlib/intern/fileops.c
View File

@@ -250,7 +250,7 @@ int BLI_delete(const char *file, int dir, int recursive)
{
int err;
UTF16_ENCODE(file)
UTF16_ENCODE(file);
if (recursive) {
callLocalErrorCallBack("Recursive delete is unsupported on Windows");
@@ -265,7 +265,7 @@ int BLI_delete(const char *file, int dir, int recursive)
if (err) callLocalErrorCallBack("Unable to delete file");
}
UTF16_UN_ENCODE(file)
UTF16_UN_ENCODE(file);
return err;
}
@@ -286,11 +286,11 @@ int BLI_move(const char *file, const char *to)
}
}
UTF16_ENCODE(file)
UTF16_ENCODE(str)
UTF16_ENCODE(file);
UTF16_ENCODE(str);
err= !MoveFileW(file_16, str_16);
UTF16_UN_ENCODE(str)
UTF16_UN_ENCODE(file)
UTF16_UN_ENCODE(str);
UTF16_UN_ENCODE(file);
if (err) {
callLocalErrorCallBack("Unable to move file");
@@ -317,11 +317,11 @@ int BLI_copy(const char *file, const char *to)
}
}
UTF16_ENCODE(file)
UTF16_ENCODE(str)
UTF16_ENCODE(file);
UTF16_ENCODE(str);
err = !CopyFileW(file_16, str_16, FALSE);
UTF16_UN_ENCODE(str)
UTF16_UN_ENCODE(file)
UTF16_UN_ENCODE(str);
UTF16_UN_ENCODE(file);
if (err) {
callLocalErrorCallBack("Unable to copy file!");
@@ -344,10 +344,10 @@ void BLI_dir_create_recursive(const char *dirname)
char *lslash;
char tmp[MAXPATHLEN];
// First remove possible slash at the end of the dirname.
// This routine otherwise tries to create
// blah1/blah2/ (with slash) after creating
// blah1/blah2 (without slash)
/* First remove possible slash at the end of the dirname.
* This routine otherwise tries to create
* blah1/blah2/ (with slash) after creating
* blah1/blah2 (without slash) */
BLI_strncpy(tmp, dirname, sizeof(tmp));
lslash= BLI_last_slash(tmp);

14
source/blender/blenlib/intern/storage.c
View File

@@ -224,13 +224,13 @@ static void bli_builddir(const char *dirname, const char *relname)
return;
}
#else
UTF16_ENCODE(dirname)
UTF16_ENCODE(dirname);
if (!SetCurrentDirectoryW(dirname_16)) {
perror(dirname);
free(dirname_16);
return;
}
UTF16_UN_ENCODE(dirname)
UTF16_UN_ENCODE(dirname);
#endif
if ((dir = (DIR *)opendir("."))) {
@@ -556,17 +556,17 @@ void BLI_file_free_lines(LinkNode *lines)
int BLI_file_older(const char *file1, const char *file2)
{
#if WIN32
#ifdef WIN32
struct _stat st1, st2;
UTF16_ENCODE(file1)
UTF16_ENCODE(file2)
UTF16_ENCODE(file1);
UTF16_ENCODE(file2);
if (_wstat(file1_16, &st1)) return 0;
if (_wstat(file2_16, &st2)) return 0;
UTF16_UN_ENCODE(file2)
UTF16_UN_ENCODE(file1)
UTF16_UN_ENCODE(file2);
UTF16_UN_ENCODE(file1);
#else
struct stat st1, st2;

5
source/creator/creator.c
View File

@@ -1169,7 +1169,7 @@ char **environ = NULL;
#ifdef WIN32
int main(int argc, const char **argv_c) /*Do not mess with const*/
int main(int argc, const char **UNUSED(argv_c)) /* Do not mess with const */
#else
int main(int argc, const char **argv)
#endif
@@ -1182,8 +1182,7 @@ int main(int argc, const char **argv)
wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc);
int argci = 0;
char **argv = MEM_mallocN(argc * sizeof(char *), "argv array");
for (argci = 0; argci < argc; argci++)
{
for (argci = 0; argci < argc; argci++) {
argv[argci] = alloc_utf_8_from_16(argv_16[argci], 0);
}
LocalFree(argv_16);