mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FLUID: Refactored writing escaped strings

This commit is contained in:
Matthias Melcher 2023-12-04 16:12:02 +01:00
parent 3e61ec7044
commit 1476d215f3
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
fluid/code.cxx
View File

@ -49,6 +49,35 @@ int is_id(char c) {
return (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9') || c=='_'; return (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9') || c=='_';
} }
/**
Write a string to a file, replacing all non-ASCII characters with octal codes.
\param[in] out output file
\param[in] text write this NUL terminated utf-8 string
\return EOF if any of the file access calls failed, 0 if OK
*/
int write_escaped_strings(FILE *out, const char *text) {
int ret = 0;
const unsigned char *utf8_text = (const unsigned char *)text;
for (const unsigned char *s = utf8_text; *s; ++s) {
unsigned char c = *s;
// escape control characters, delete, all utf-8, and the double quotes
// note: we should have an option in the project settings to allow utf-8
// characters in the output text and not escape them
if (c < 32 || c > 126 || c == '\"') {
if (c == '\r') {
ret = fputs("\\r", out);
} else if (c == '\n') {
ret = fputs("\\n", out);
} else {
ret = fprintf(out, "\\%03o", c);
}
} else {
ret = putc((int)c, out);
}
}
return ret;
}
/** /**
Write a file that contains all label and tooltip strings for internationalization. Write a file that contains all label and tooltip strings for internationalization.
The user is responsible to set the right file name extension. The file format The user is responsible to set the right file name extension. The file format
@ -73,20 +102,12 @@ int write_strings(const Fl_String &filename) {
w = (Fl_Widget_Type *)p; w = (Fl_Widget_Type *)p;
if (w->label()) { if (w->label()) {
for (const char *s = w->label(); *s; s ++) write_escaped_strings(fp, w->label());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
putc('\n', fp); putc('\n', fp);
} }
if (w->tooltip()) { if (w->tooltip()) {
for (const char *s = w->tooltip(); *s; s ++) write_escaped_strings(fp, w->tooltip());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
putc('\n', fp); putc('\n', fp);
} }
} }
@ -100,22 +121,12 @@ int write_strings(const Fl_String &filename) {
w = (Fl_Widget_Type *)p; w = (Fl_Widget_Type *)p;
if (w->label()) { if (w->label()) {
const char *s;
fputs("msgid \"", fp); fputs("msgid \"", fp);
for (s = w->label(); *s; s ++) write_escaped_strings(fp, w->label());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
fputs("\"\n", fp); fputs("\"\n", fp);
fputs("msgstr \"", fp); fputs("msgstr \"", fp);
for (s = w->label(); *s; s ++) write_escaped_strings(fp, w->label());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
fputs("\"\n", fp); fputs("\"\n", fp);
} }
@ -123,19 +134,11 @@ int write_strings(const Fl_String &filename) {
const char *s; const char *s;
fputs("msgid \"", fp); fputs("msgid \"", fp);
for (s = w->tooltip(); *s; s ++) write_escaped_strings(fp, w->tooltip());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
fputs("\"\n", fp); fputs("\"\n", fp);
fputs("msgstr \"", fp); fputs("msgstr \"", fp);
for (s = w->tooltip(); *s; s ++) write_escaped_strings(fp, w->tooltip());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
fputs("\"\n", fp); fputs("\"\n", fp);
} }
} }
@ -153,21 +156,13 @@ int write_strings(const Fl_String &filename) {
if (w->label()) { if (w->label()) {
fprintf(fp, "%d \"", i ++); fprintf(fp, "%d \"", i ++);
for (const char *s = w->label(); *s; s ++) write_escaped_strings(fp, w->label());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
fputs("\"\n", fp); fputs("\"\n", fp);
} }
if (w->tooltip()) { if (w->tooltip()) {
fprintf(fp, "%d \"", i ++); fprintf(fp, "%d \"", i ++);
for (const char *s = w->tooltip(); *s; s ++) write_escaped_strings(fp, w->tooltip());
if (*s < 32 || *s > 126 || *s == '\"')
fprintf(fp, "\\%03o", *s);
else
putc(*s, fp);
fputs("\"\n", fp); fputs("\"\n", fp);
} }
} }