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

some utf8map corrections

Browse Source 
Correct a color value and remove an unnecessary variable
This commit is contained in:
nhmall
2024-01-25 16:45:58 -05:00
parent 4512e85e58
commit fa672fa1ba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utf8map.c
+6 -6
View File
@@ -49,6 +49,7 @@ static int glyph_find_core(const char *id, struct find_struct *findwhat);
static char *fix_glyphname(char *str); static char *fix_glyphname(char *str);
static int32_t rgbstr_to_int32(const char *rgbstr); static int32_t rgbstr_to_int32(const char *rgbstr);
boolean closest_color(uint32_t lcolor, uint32_t *closecolor, int *clridx); boolean closest_color(uint32_t lcolor, uint32_t *closecolor, int *clridx);
static const long nonzero_black = 0x1000000;
static void static void
to_custom_symset_entry_callback(int glyph, struct find_struct *findwhat) to_custom_symset_entry_callback(int glyph, struct find_struct *findwhat)
@@ -130,8 +131,7 @@ glyphrep_to_custom_map_entries(const char *op, int *glyphptr)
implements the color switch, needs to either check that bit implements the color switch, needs to either check that bit
or appropriately mask colors with 0xFFFFFF. */ or appropriately mask colors with 0xFFFFFF. */
to_custom_symbol_find.color = (rgb == -1 || !c_rgb) ? 0L to_custom_symbol_find.color = (rgb == -1 || !c_rgb) ? 0L
: (rgb == 0L) ? (0 & 0x1000000) : (rgb == 0L) ? nonzero_black : rgb;
: rgb;
to_custom_symbol_find.extraval = glyphptr; to_custom_symbol_find.extraval = glyphptr;
to_custom_symbol_find.callback = to_custom_symset_entry_callback; to_custom_symbol_find.callback = to_custom_symset_entry_callback;
reslt = glyph_find_core(c_glyphid, &to_custom_symbol_find); reslt = glyph_find_core(c_glyphid, &to_custom_symbol_find);
@@ -207,13 +207,13 @@ static int
unicode_val(const char *cp) unicode_val(const char *cp)
{ {
const char *dp; const char *dp;
int cval = 0, dcount, unicode = 0; int cval = 0, dcount;
static const char hex[] = "00112233445566778899aAbBcCdDeEfF"; static const char hex[] = "00112233445566778899aAbBcCdDeEfF";
if (cp && *cp) { if (cp && *cp) {
cval = dcount = 0; cval = dcount = 0;
if ((unicode = ((*cp == 'U' || *cp == 'u') && cp[1] == '+')) && cp[2] if ((*cp == 'U' || *cp == 'u')
&& (dp = strchr(hex, cp[2])) != 0) { && cp[1] == '+' && cp[2] && (dp = strchr(hex, cp[2])) != 0) {
cp += 2; /* move past the 'U' and '+' */ cp += 2; /* move past the 'U' and '+' */
do { do {
cval = (cval * 16) + ((int) (dp - hex) / 2); cval = (cval * 16) + ((int) (dp - hex) / 2);
@@ -1212,7 +1212,7 @@ glyphs_to_unicode(const char *id, const char *unicode_val, long clr)
simple checking for 0 to detect "not set". The window port that simple checking for 0 to detect "not set". The window port that
implements the color switch, needs to either check that bit implements the color switch, needs to either check that bit
or appropriately mask colors with 0xFFFFFF. */ or appropriately mask colors with 0xFFFFFF. */
to_unicode.color = (clr == -1) ? 0L : (clr == 0L) ? (0 & 0x1000000) : clr; to_unicode.color = (clr == -1) ? 0L : (clr == 0L) ? nonzero_black : clr;
return glyph_find_core(id, &to_unicode); return glyph_find_core(id, &to_unicode);
} }