notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More UTF-8 fixes (text tool deletes). Robert Glowczynski

Browse source
This commit is contained in:
William Kendrick 2003-04-06 07:12:39 +00:00
parent ee92b98aa2
commit 41bfe0e951
2 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -6,7 +6,7 @@
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.newbreedsoftware.com/tuxpaint/ # http://www.newbreedsoftware.com/tuxpaint/
# June 14, 2002 - February 28, 2003 # June 14, 2002 - April 5, 2003
# Where to install things: # Where to install things:

57
src/tuxpaint.c
View file

@ -391,7 +391,7 @@ char file_id[32];
int brush_scroll, stamp_scroll, font_scroll; int brush_scroll, stamp_scroll, font_scroll;
int eraser_sound; int eraser_sound;
char texttool_str[128]; char texttool_str[256];
int texttool_len; int texttool_len;
int tool_avail[NUM_TOOLS], tool_avail_bak[NUM_TOOLS]; int tool_avail[NUM_TOOLS], tool_avail_bak[NUM_TOOLS];
@ -542,6 +542,8 @@ void convert_open(const char * from);
void convert_close(); void convert_close();
char * convert2utf8(char c); char * convert2utf8(char c);
int converts(); int converts();
int delete_utf8_char(char * utf8_str, int len);
#define MAX_UTF8_CHAR_LENGTH 6
#define USEREVENT_TEXT_UPDATE 1 #define USEREVENT_TEXT_UPDATE 1
@ -964,9 +966,16 @@ void mainloop(void)
if (texttool_len > 0) if (texttool_len > 0)
{ {
texttool_len--; if (converts())
texttool_str[texttool_len] = '\0'; {
playsound(0, SND_KEYCLICK, 1); texttool_len = delete_utf8_char(texttool_str, texttool_len);
}
else
{
texttool_len--;
texttool_str[texttool_len] = '\0';
playsound(0, SND_KEYCLICK, 1);
}
do_render_cur_text(0); do_render_cur_text(0);
} }
@ -995,7 +1004,7 @@ void mainloop(void)
} }
else if (isprint(key_unicode)) else if (isprint(key_unicode))
{ {
if (texttool_len < sizeof(texttool_str) - 1) if (texttool_len < sizeof(texttool_str) - MAX_UTF8_CHAR_LENGTH)
{ {
#ifdef DEBUG #ifdef DEBUG
printf(" key = %c\n" printf(" key = %c\n"
@ -10938,3 +10947,41 @@ char * convert2utf8(char c)
return strdup(outbuf); return strdup(outbuf);
} }
/* in:
char *utf8_str - buffer containing a well-formed utf8 string
int len - length of the above string in bytes; len >= 1
out:
int result - length of the above string in bytes after removing
last utf8 char
*/
int delete_utf8_char(char *utf8_str, int len)
{
/* from man utf-8:
The first byte of a multi-byte sequence which represents a single
non-ASCII UCS character is always in the range 0xc0 to 0xfd and indi-
cates how long this multi-byte sequence is. All further bytes in a
multi-byte sequence are in the range 0x80 to 0xbf.
*/
unsigned char *current_char_ptr = utf8_str + len - 1;
unsigned char current_char = *current_char_ptr;
while ( (current_char >= 0x80) && (current_char <= 0xbf) )
{
/* part of the utf8 multibyte char but not the first byte */
len--;
current_char_ptr--;
current_char = *current_char_ptr;
}
/* we have 1 char to remove */
*current_char_ptr = '\0';
len--;
return len;
}