Skip to content

Commit 6a3864f

Browse files
cosmos72cosmos72
committed
libs/libtutf: add TW_CONST to exported global arrays
1 parent e85433c commit 6a3864f

File tree

9 files changed

+104
-105
lines changed

9 files changed

+104
-105
lines changed

‎include/Tutf/Tutf.h

+92-92
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ extern "C" {
594594
#define T_NAME_VT100GR "vt100-graphics"
595595
#define T_ALIASES_VT100GR "vt100-gr", "vt100"
596596

597-
typedef trune *Tutf_array;
597+
typedef TW_CONST trune *Tutf_array;
598598
typedef trune (*Tutf_function)(trune);
599599

600600
/* get the charset `id' (opaque) from a charset alias */
@@ -741,99 +741,99 @@ trune Tutf_UTF_32_to_VT100GR(trune c);
741741
#define Tutf_ISO8859_15_to_UTF_32 Tutf_ISO_8859_15_to_UTF_32
742742
#define Tutf_ISO8859_16_to_UTF_32 Tutf_ISO_8859_16_to_UTF_32
743743

744-
extern trune Tutf_ANSI_X3_4_to_UTF_32[0x100];
745-
extern trune Tutf_ISO_8859_1_to_UTF_32[0x100];
746-
extern trune Tutf_ISO_8859_2_to_UTF_32[0x100];
747-
extern trune Tutf_ISO_8859_3_to_UTF_32[0x100];
748-
extern trune Tutf_ISO_8859_4_to_UTF_32[0x100];
749-
extern trune Tutf_ISO_8859_5_to_UTF_32[0x100];
750-
extern trune Tutf_ISO_8859_6_to_UTF_32[0x100];
751-
extern trune Tutf_ISO_8859_7_to_UTF_32[0x100];
752-
extern trune Tutf_ISO_8859_8_to_UTF_32[0x100];
753-
extern trune Tutf_ISO_8859_9_to_UTF_32[0x100];
754-
extern trune Tutf_ISO_8859_10_to_UTF_32[0x100];
755-
extern trune Tutf_ISO_8859_13_to_UTF_32[0x100];
756-
extern trune Tutf_ISO_8859_14_to_UTF_32[0x100];
757-
extern trune Tutf_ISO_8859_15_to_UTF_32[0x100];
758-
extern trune Tutf_ISO_8859_16_to_UTF_32[0x100];
759-
760-
extern trune Tutf_CP424_to_UTF_32[0x100];
761-
extern trune Tutf_CP437_to_UTF_32[0x100];
762-
extern trune Tutf_CP737_to_UTF_32[0x100];
763-
extern trune Tutf_CP775_to_UTF_32[0x100];
764-
extern trune Tutf_CP850_to_UTF_32[0x100];
765-
extern trune Tutf_CP852_to_UTF_32[0x100];
766-
extern trune Tutf_CP855_to_UTF_32[0x100];
767-
extern trune Tutf_CP856_to_UTF_32[0x100];
768-
extern trune Tutf_CP857_to_UTF_32[0x100];
769-
extern trune Tutf_CP860_to_UTF_32[0x100];
770-
extern trune Tutf_CP861_to_UTF_32[0x100];
771-
extern trune Tutf_CP862_to_UTF_32[0x100];
772-
extern trune Tutf_CP863_to_UTF_32[0x100];
773-
extern trune Tutf_CP864_to_UTF_32[0x100];
774-
extern trune Tutf_CP865_to_UTF_32[0x100];
775-
extern trune Tutf_CP866_to_UTF_32[0x100];
776-
extern trune Tutf_CP869_to_UTF_32[0x100];
777-
extern trune Tutf_CP874_to_UTF_32[0x100];
778-
extern trune Tutf_CP932_to_UTF_32[0x100];
779-
extern trune Tutf_CP936_to_UTF_32[0x100];
780-
extern trune Tutf_CP949_to_UTF_32[0x100];
781-
extern trune Tutf_CP950_to_UTF_32[0x100];
782-
extern trune Tutf_CP1006_to_UTF_32[0x100];
783-
extern trune Tutf_CP1250_to_UTF_32[0x100];
784-
extern trune Tutf_CP1251_to_UTF_32[0x100];
785-
extern trune Tutf_CP1252_to_UTF_32[0x100];
786-
extern trune Tutf_CP1253_to_UTF_32[0x100];
787-
extern trune Tutf_CP1254_to_UTF_32[0x100];
788-
extern trune Tutf_CP1255_to_UTF_32[0x100];
789-
extern trune Tutf_CP1256_to_UTF_32[0x100];
790-
extern trune Tutf_CP1257_to_UTF_32[0x100];
791-
extern trune Tutf_CP1258_to_UTF_32[0x100];
792-
793-
extern trune Tutf_ADOBE_STDENC_to_UTF_32[0x100];
794-
extern trune Tutf_ADOBE_SYMBOL_to_UTF_32[0x100];
795-
796-
extern trune Tutf_MAC_ARABIC_to_UTF_32[0x100];
797-
extern trune Tutf_MAC_CELTIC_to_UTF_32[0x100];
798-
extern trune Tutf_MAC_CENTRALEUROPE_to_UTF_32[0x100];
799-
extern trune Tutf_MAC_CROATIAN_to_UTF_32[0x100];
800-
extern trune Tutf_MAC_CYRILLIC_to_UTF_32[0x100];
801-
extern trune Tutf_MAC_DEVANAGARI_to_UTF_32[0x100];
802-
extern trune Tutf_MAC_DINGBATS_to_UTF_32[0x100];
803-
extern trune Tutf_MAC_FARSI_to_UTF_32[0x100];
804-
extern trune Tutf_MAC_GAELIC_to_UTF_32[0x100];
805-
extern trune Tutf_MAC_GREEK_to_UTF_32[0x100];
806-
extern trune Tutf_MAC_GUJARATI_to_UTF_32[0x100];
807-
extern trune Tutf_MAC_GURMUKHI_to_UTF_32[0x100];
808-
extern trune Tutf_MAC_HEBREW_to_UTF_32[0x100];
809-
extern trune Tutf_MAC_ICELANDIC_to_UTF_32[0x100];
810-
extern trune Tutf_MAC_INUIT_to_UTF_32[0x100];
811-
extern trune Tutf_MAC_ROMAN_to_UTF_32[0x100];
812-
extern trune Tutf_MAC_ROMANIAN_to_UTF_32[0x100];
813-
extern trune Tutf_MAC_SYMBOL_to_UTF_32[0x100];
814-
extern trune Tutf_MAC_THAI_to_UTF_32[0x100];
815-
extern trune Tutf_MAC_TURKISH_to_UTF_32[0x100];
816-
extern trune Tutf_MAC_UKRAINE_to_UTF_32[0x100];
817-
818-
extern trune Tutf_MS_MAC_CYRILLIC_to_UTF_32[0x100];
819-
extern trune Tutf_MS_MAC_GREEK_to_UTF_32[0x100];
820-
extern trune Tutf_MS_MAC_ICELANDIC_to_UTF_32[0x100];
821-
extern trune Tutf_MS_MAC_LATIN2_to_UTF_32[0x100];
822-
extern trune Tutf_MS_MAC_ROMAN_to_UTF_32[0x100];
823-
extern trune Tutf_MS_MAC_TURKISH_to_UTF_32[0x100];
824-
825-
extern trune Tutf_APL_ISO_IR_68_to_UTF_32[0x100];
826-
extern trune Tutf_ATARIST_to_UTF_32[0x100];
827-
extern trune Tutf_HP_ROMAN8_to_UTF_32[0x100];
828-
extern trune Tutf_JISX0201_to_UTF_32[0x100];
829-
extern trune Tutf_KZ1048_to_UTF_32[0x100];
830-
extern trune Tutf_KOI8_R_to_UTF_32[0x100];
831-
extern trune Tutf_KOI8_U_to_UTF_32[0x100];
832-
extern trune Tutf_NEXTSTEP_to_UTF_32[0x100];
833-
extern trune Tutf_VT100GR_to_UTF_32[0x100];
744+
extern TW_CONST trune Tutf_ANSI_X3_4_to_UTF_32[0x100];
745+
extern TW_CONST trune Tutf_ISO_8859_1_to_UTF_32[0x100];
746+
extern TW_CONST trune Tutf_ISO_8859_2_to_UTF_32[0x100];
747+
extern TW_CONST trune Tutf_ISO_8859_3_to_UTF_32[0x100];
748+
extern TW_CONST trune Tutf_ISO_8859_4_to_UTF_32[0x100];
749+
extern TW_CONST trune Tutf_ISO_8859_5_to_UTF_32[0x100];
750+
extern TW_CONST trune Tutf_ISO_8859_6_to_UTF_32[0x100];
751+
extern TW_CONST trune Tutf_ISO_8859_7_to_UTF_32[0x100];
752+
extern TW_CONST trune Tutf_ISO_8859_8_to_UTF_32[0x100];
753+
extern TW_CONST trune Tutf_ISO_8859_9_to_UTF_32[0x100];
754+
extern TW_CONST trune Tutf_ISO_8859_10_to_UTF_32[0x100];
755+
extern TW_CONST trune Tutf_ISO_8859_13_to_UTF_32[0x100];
756+
extern TW_CONST trune Tutf_ISO_8859_14_to_UTF_32[0x100];
757+
extern TW_CONST trune Tutf_ISO_8859_15_to_UTF_32[0x100];
758+
extern TW_CONST trune Tutf_ISO_8859_16_to_UTF_32[0x100];
759+
760+
extern TW_CONST trune Tutf_CP424_to_UTF_32[0x100];
761+
extern TW_CONST trune Tutf_CP437_to_UTF_32[0x100];
762+
extern TW_CONST trune Tutf_CP737_to_UTF_32[0x100];
763+
extern TW_CONST trune Tutf_CP775_to_UTF_32[0x100];
764+
extern TW_CONST trune Tutf_CP850_to_UTF_32[0x100];
765+
extern TW_CONST trune Tutf_CP852_to_UTF_32[0x100];
766+
extern TW_CONST trune Tutf_CP855_to_UTF_32[0x100];
767+
extern TW_CONST trune Tutf_CP856_to_UTF_32[0x100];
768+
extern TW_CONST trune Tutf_CP857_to_UTF_32[0x100];
769+
extern TW_CONST trune Tutf_CP860_to_UTF_32[0x100];
770+
extern TW_CONST trune Tutf_CP861_to_UTF_32[0x100];
771+
extern TW_CONST trune Tutf_CP862_to_UTF_32[0x100];
772+
extern TW_CONST trune Tutf_CP863_to_UTF_32[0x100];
773+
extern TW_CONST trune Tutf_CP864_to_UTF_32[0x100];
774+
extern TW_CONST trune Tutf_CP865_to_UTF_32[0x100];
775+
extern TW_CONST trune Tutf_CP866_to_UTF_32[0x100];
776+
extern TW_CONST trune Tutf_CP869_to_UTF_32[0x100];
777+
extern TW_CONST trune Tutf_CP874_to_UTF_32[0x100];
778+
extern TW_CONST trune Tutf_CP932_to_UTF_32[0x100];
779+
extern TW_CONST trune Tutf_CP936_to_UTF_32[0x100];
780+
extern TW_CONST trune Tutf_CP949_to_UTF_32[0x100];
781+
extern TW_CONST trune Tutf_CP950_to_UTF_32[0x100];
782+
extern TW_CONST trune Tutf_CP1006_to_UTF_32[0x100];
783+
extern TW_CONST trune Tutf_CP1250_to_UTF_32[0x100];
784+
extern TW_CONST trune Tutf_CP1251_to_UTF_32[0x100];
785+
extern TW_CONST trune Tutf_CP1252_to_UTF_32[0x100];
786+
extern TW_CONST trune Tutf_CP1253_to_UTF_32[0x100];
787+
extern TW_CONST trune Tutf_CP1254_to_UTF_32[0x100];
788+
extern TW_CONST trune Tutf_CP1255_to_UTF_32[0x100];
789+
extern TW_CONST trune Tutf_CP1256_to_UTF_32[0x100];
790+
extern TW_CONST trune Tutf_CP1257_to_UTF_32[0x100];
791+
extern TW_CONST trune Tutf_CP1258_to_UTF_32[0x100];
792+
793+
extern TW_CONST trune Tutf_ADOBE_STDENC_to_UTF_32[0x100];
794+
extern TW_CONST trune Tutf_ADOBE_SYMBOL_to_UTF_32[0x100];
795+
796+
extern TW_CONST trune Tutf_MAC_ARABIC_to_UTF_32[0x100];
797+
extern TW_CONST trune Tutf_MAC_CELTIC_to_UTF_32[0x100];
798+
extern TW_CONST trune Tutf_MAC_CENTRALEUROPE_to_UTF_32[0x100];
799+
extern TW_CONST trune Tutf_MAC_CROATIAN_to_UTF_32[0x100];
800+
extern TW_CONST trune Tutf_MAC_CYRILLIC_to_UTF_32[0x100];
801+
extern TW_CONST trune Tutf_MAC_DEVANAGARI_to_UTF_32[0x100];
802+
extern TW_CONST trune Tutf_MAC_DINGBATS_to_UTF_32[0x100];
803+
extern TW_CONST trune Tutf_MAC_FARSI_to_UTF_32[0x100];
804+
extern TW_CONST trune Tutf_MAC_GAELIC_to_UTF_32[0x100];
805+
extern TW_CONST trune Tutf_MAC_GREEK_to_UTF_32[0x100];
806+
extern TW_CONST trune Tutf_MAC_GUJARATI_to_UTF_32[0x100];
807+
extern TW_CONST trune Tutf_MAC_GURMUKHI_to_UTF_32[0x100];
808+
extern TW_CONST trune Tutf_MAC_HEBREW_to_UTF_32[0x100];
809+
extern TW_CONST trune Tutf_MAC_ICELANDIC_to_UTF_32[0x100];
810+
extern TW_CONST trune Tutf_MAC_INUIT_to_UTF_32[0x100];
811+
extern TW_CONST trune Tutf_MAC_ROMAN_to_UTF_32[0x100];
812+
extern TW_CONST trune Tutf_MAC_ROMANIAN_to_UTF_32[0x100];
813+
extern TW_CONST trune Tutf_MAC_SYMBOL_to_UTF_32[0x100];
814+
extern TW_CONST trune Tutf_MAC_THAI_to_UTF_32[0x100];
815+
extern TW_CONST trune Tutf_MAC_TURKISH_to_UTF_32[0x100];
816+
extern TW_CONST trune Tutf_MAC_UKRAINE_to_UTF_32[0x100];
817+
818+
extern TW_CONST trune Tutf_MS_MAC_CYRILLIC_to_UTF_32[0x100];
819+
extern TW_CONST trune Tutf_MS_MAC_GREEK_to_UTF_32[0x100];
820+
extern TW_CONST trune Tutf_MS_MAC_ICELANDIC_to_UTF_32[0x100];
821+
extern TW_CONST trune Tutf_MS_MAC_LATIN2_to_UTF_32[0x100];
822+
extern TW_CONST trune Tutf_MS_MAC_ROMAN_to_UTF_32[0x100];
823+
extern TW_CONST trune Tutf_MS_MAC_TURKISH_to_UTF_32[0x100];
824+
825+
extern TW_CONST trune Tutf_APL_ISO_IR_68_to_UTF_32[0x100];
826+
extern TW_CONST trune Tutf_ATARIST_to_UTF_32[0x100];
827+
extern TW_CONST trune Tutf_HP_ROMAN8_to_UTF_32[0x100];
828+
extern TW_CONST trune Tutf_JISX0201_to_UTF_32[0x100];
829+
extern TW_CONST trune Tutf_KZ1048_to_UTF_32[0x100];
830+
extern TW_CONST trune Tutf_KOI8_R_to_UTF_32[0x100];
831+
extern TW_CONST trune Tutf_KOI8_U_to_UTF_32[0x100];
832+
extern TW_CONST trune Tutf_NEXTSTEP_to_UTF_32[0x100];
833+
extern TW_CONST trune Tutf_VT100GR_to_UTF_32[0x100];
834834

835835
#define Tutf_CP437_to_ASCII Tutf_CP437_to_ANSI_X3_4
836-
extern trune Tutf_CP437_to_ANSI_X3_4[0x100];
836+
extern TW_CONST trune Tutf_CP437_to_ANSI_X3_4[0x100];
837837

838838
#ifdef __cplusplus
839839
}

‎libs/libtutf/ascii.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
*
1010
*/
1111

12-
trune T_CAT3(Tutf_, T_MAP(ASCII), _to_UTF_32)[0x100] = {
12+
TW_CONST trune T_CAT3(Tutf_, T_MAP(ASCII), _to_UTF_32)[0x100] = {
1313
#define EL(x) T_UTF(UTF_32, x),
1414
T_LIST(ASCII, EL)
1515
#undef EL
1616
};
1717

18-
trune T_CAT(Tutf_CP437_to_, T_MAP(ASCII))[0x100] = {
18+
TW_CONST trune T_CAT(Tutf_CP437_to_, T_MAP(ASCII))[0x100] = {
1919
' ', 'O', 'O', 'v', '@', 'g', '!', '.', '.', 'o', 'o', 't', 'g', 'f', 'f', '*', '>', '<', '|',
2020
'!', 'q', 'S', '_', '|', '^', 'v', '>', '<', 'L', '-', '^', 'v',
2121

‎libs/libtutf/cp437.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*/
1111

12-
trune Tutf_CP437_to_UTF_32[0x100] = {
12+
TW_CONST trune Tutf_CP437_to_UTF_32[0x100] = {
1313
#define EL(x) T_UTF(UTF_32, x),
1414
T_LIST(CP437, EL)
1515
#undef EL

‎libs/libtutf/cp865.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*/
1111

12-
trune Tutf_CP865_to_UTF_32[0x100] = {
12+
TW_CONST trune Tutf_CP865_to_UTF_32[0x100] = {
1313
#define EL(x) T_UTF(UTF_32, x),
1414
T_LIST(CP865, EL)
1515
#undef EL

‎libs/libtutf/iso8859_1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*/
1111

12-
trune Tutf_ISO8859_1_to_UTF_32[0x100] = {
12+
TW_CONST trune Tutf_ISO8859_1_to_UTF_32[0x100] = {
1313
#define EL(x) T_UTF(UTF_32, x),
1414
T_LIST(ISO8859_1, EL)
1515
#undef EL

‎libs/libtutf/template.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#define T_TEMPLATE T_MAP(TEMPLATE)
1313

14-
trune T_CAT3(Tutf_, T_TEMPLATE, _to_UTF_32)[0x100] = {
14+
TW_CONST trune T_CAT3(Tutf_, T_TEMPLATE, _to_UTF_32)[0x100] = {
1515
#define EL(x) T_UTF(UTF_32, x),
1616
T_LIST(T_TEMPLATE, EL)
1717
#undef EL

‎server/methods.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ byte FillButton(Tgadget g, Twidget Parent, udat Code, dat Left, dat Up, udat Fla
169169

170170
static struct SgadgetFn _FnGadget = {
171171
/* Twidget */
172-
(Twidget(*)(Tgadget))TtyKbdFocus, //
172+
(Twidget(*)(Tgadget))TtyKbdFocus,
173173
/* Tgadget */
174-
&_FnWidget, FillButton, //
175-
WriteTextsGadget, /* exported by resize.c */
176-
WriteTRunesGadget, /* exported by resize.c */
174+
FillButton, /**/
175+
WriteTextsGadget, /* exported by resize.c */
176+
WriteTRunesGadget, /* exported by resize.c */
177177
};
178178

179179
/* Twindow */

‎server/obj/all.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ Tall Sall::Init() {
5757
Selection = &_Selection;
5858
Clipboard = &_Clipboard;
5959
SetUp = &_SetUp;
60-
Gtranslations[VT100GR_MAP] = Tutf_VT100GR_to_UTF_32;
60+
Gtranslations[VT100GR_MAP] = const_cast<trune *>(Tutf_VT100GR_to_UTF_32);
6161
Gtranslations[LATIN1_MAP] = NULL; /* it's the identity */
62-
Gtranslations[IBMPC_MAP] = Tutf_CP437_to_UTF_32;
62+
Gtranslations[IBMPC_MAP] = const_cast<trune *>(Tutf_CP437_to_UTF_32);
6363
Gtranslations[USER_MAP] = GtransUser;
6464
return this;
6565
};

‎server/obj/gadget.h

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ struct SgadgetFn {
1919
/* Twidget */
2020
Twidget (*KbdFocus)(Tgadget);
2121
/* Tgadget */
22-
TwidgetFn Fn_Widget;
2322
byte (*FillButton)(Tgadget g, Twidget Parent, udat Code, dat Left, dat Up, udat Flags,
2423
const char *Text, tcolor Color, tcolor ColorDisabled);
2524
void (*WriteTexts)(Tgadget g, byte bitmap, dat xwidth, dat ywidth, const char *Text, dat Left,

0 commit comments

Comments
 (0)