kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

text delimiter - convert to unicode before comparing characters.

Browse Source
This commit is contained in:
Campbell Barton 2012-03-12 00:03:42 +00:00
parent cae11a98f9
commit 7afeb21a41
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenlib/intern/string_cursor_utf8.c
View File

@ -48,19 +48,21 @@ typedef enum strCursorDelimType {
} strCursorDelimType; } strCursorDelimType;
/* return 1 if char ch is special character, otherwise return 0 */ /* return 1 if char ch is special character, otherwise return 0 */
static strCursorDelimType test_special_char(const char ch) static strCursorDelimType test_special_char(const char *ch_utf8)
{ {
/* TODO - use BLI_str_utf8_as_unicode rather then assuming ascii */ /* for full unicode support we really need to have large lookup tables to figure
* out whats what in every possible char set - and python, glib both have these. */
unsigned int uch = BLI_str_utf8_as_unicode(ch_utf8);
if ((ch >= 'a' && ch <= 'z') || if ((uch >= 'a' && uch <= 'z') ||
(ch >= 'A' && ch <= 'Z') || (uch >= 'A' && uch <= 'Z') ||
(ch == '_') /* not quite correct but allow for python, could become configurable */ (uch == '_') /* not quite correct but allow for python, could become configurable */
) )
{ {
return STRCUR_DELIM_ALPHA; return STRCUR_DELIM_ALPHA;
} }
switch (ch) { switch (uch) {
case ',': case ',':
case '.': case '.':
return STRCUR_DELIM_PUNCT; return STRCUR_DELIM_PUNCT;
@ -150,13 +152,13 @@ void BLI_str_cursor_step_utf8(const char *str, size_t maxlen,
BLI_str_cursor_step_next_utf8(str, maxlen, pos); BLI_str_cursor_step_next_utf8(str, maxlen, pos);
if (jump != STRCUR_JUMP_NONE) { if (jump != STRCUR_JUMP_NONE) {
const strCursorDelimType is_special = (*pos) < maxlen ? test_special_char(str[(*pos)]) : STRCUR_DELIM_NONE; const strCursorDelimType is_special = (*pos) < maxlen ? test_special_char(&str[*pos]) : STRCUR_DELIM_NONE;
/* jump between special characters (/,\,_,-, etc.), /* jump between special characters (/,\,_,-, etc.),
* look at function test_special_char() for complete * look at function test_special_char() for complete
* list of special character, ctr -> */ * list of special character, ctr -> */
while ((*pos) < maxlen) { while ((*pos) < maxlen) {
if (BLI_str_cursor_step_next_utf8(str, maxlen, pos)) { if (BLI_str_cursor_step_next_utf8(str, maxlen, pos)) {
if ((jump != STRCUR_JUMP_ALL) && (is_special != test_special_char(str[(*pos)]))) if ((jump != STRCUR_JUMP_ALL) && (is_special != test_special_char(&str[*pos])))
break; break;
} }
else { else {
@ -169,13 +171,13 @@ void BLI_str_cursor_step_utf8(const char *str, size_t maxlen,
BLI_str_cursor_step_prev_utf8(str, maxlen, pos); BLI_str_cursor_step_prev_utf8(str, maxlen, pos);
if (jump != STRCUR_JUMP_NONE) { if (jump != STRCUR_JUMP_NONE) {
const strCursorDelimType is_special = (*pos) > 1 ? test_special_char(str[(*pos) - 1]) : STRCUR_DELIM_NONE; const strCursorDelimType is_special = (*pos) > 1 ? test_special_char(&str[(*pos) - 1]) : STRCUR_DELIM_NONE;
/* jump between special characters (/,\,_,-, etc.), /* jump between special characters (/,\,_,-, etc.),
* look at function test_special_char() for complete * look at function test_special_char() for complete
* list of special character, ctr -> */ * list of special character, ctr -> */
while ((*pos) > 0) { while ((*pos) > 0) {
if (BLI_str_cursor_step_prev_utf8(str, maxlen, pos)) { if (BLI_str_cursor_step_prev_utf8(str, maxlen, pos)) {
if ((jump != STRCUR_JUMP_ALL) && (is_special != test_special_char(str[(*pos)]))) if ((jump != STRCUR_JUMP_ALL) && (is_special != test_special_char(&str[*pos])))
break; break;
} }
else { else {