nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Parse only Unicode symbols in the current symset

Browse Source
This commit is contained in:
Ray Chason
2022-11-23 12:05:04 -08:00
committed by PatR
parent 0be8f85d2c
commit 5181c287d3
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/symbols.c
+15 -5
View File
@@ -332,6 +332,10 @@ clear_symsetentry(int which_set, boolean name_too)
free((genericptr_t) g.symset[which_set].name); free((genericptr_t) g.symset[which_set].name);
g.symset[which_set].name = (char *) 0; g.symset[which_set].name = (char *) 0;
} }
#ifdef ENHANCED_SYMBOLS
free_all_glyphmap_u();
purge_custom_entries(which_set);
#endif
} }
boolean symset_is_compatible(enum symset_handling_types handling, unsigned long wincap2) boolean symset_is_compatible(enum symset_handling_types handling, unsigned long wincap2)
@@ -462,7 +466,11 @@ parse_sym_line(char *buf, int which_set)
symp = match_sym(buf); symp = match_sym(buf);
if (!symp && buf[0] == 'G' && buf[1] == '_') { if (!symp && buf[0] == 'G' && buf[1] == '_') {
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
is_glyph = match_glyph(buf); if (g.chosen_symset_start) {
is_glyph = match_glyph(buf);
} else {
is_glyph = TRUE; /* report error only once */
}
#else #else
enhanced_unavailable = TRUE; enhanced_unavailable = TRUE;
#endif #endif
@@ -608,7 +616,9 @@ parse_sym_line(char *buf, int which_set)
} }
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
} else { } else {
glyphrep_to_custom_map_entries(buf, &glyph); if (g.chosen_symset_start) {
glyphrep_to_custom_map_entries(buf, &glyph);
}
#endif #endif
} }
} }
@@ -1058,11 +1068,11 @@ apply_customizations_to_symset(enum graphics_sets which_set)
struct customization_detail *details; struct customization_detail *details;
if (g.symset[which_set].handling == H_UTF8 if (g.symset[which_set].handling == H_UTF8
&& g.sym_customizations[UNICODESET].count && g.sym_customizations[which_set].count
&& g.sym_customizations[UNICODESET].details) { && g.sym_customizations[which_set].details) {
/* These UTF-8 customizations get applied to the glyphmap array, /* These UTF-8 customizations get applied to the glyphmap array,
not to symset entries */ not to symset entries */
details = g.sym_customizations[UNICODESET].details; details = g.sym_customizations[which_set].details;
while (details) { while (details) {
gm = &glyphmap[details->content.urep.glyphidx]; gm = &glyphmap[details->content.urep.glyphidx];
(void) set_map_u(gm, (void) set_map_u(gm,
src/utf8map.c
+1 -1
View File
@@ -65,7 +65,7 @@ to_custom_symset_entry_callback(int glyph, struct find_struct *findwhat)
(findwhat->color != 0L) ? findwhat->color : 0L); (findwhat->color != 0L) ? findwhat->color : 0L);
#endif #endif
add_custom_urep_entry(known_handling[H_UTF8], glyph, add_custom_urep_entry(known_handling[H_UTF8], glyph,
uval, utf8str, findwhat->color, UNICODESET); uval, utf8str, findwhat->color, g.symset_which_set);
} }
} }