shithub: orca

Info  •  Files  •  Log  •  Branches

Cleanup

--- a/base.h

+++ b/base.h

@@ -91,7 +91,7 @@

 }

 ORCA_OK_IF_UNUSED

-static bool is_valid_glyph(Glyph c) {

+static bool orca_is_valid_glyph(Glyph c) {

   if (c >= '0' && c <= '9')

     return true;

   if (c >= 'A' && c <= 'Z')

--- a/sysmisc.c

+++ b/sysmisc.c

@@ -51,7 +51,7 @@

         continue;

       }

       if (c != ' ' && y < height && x < width) {

-        Glyph g = is_valid_glyph((Glyph)c) ? (Glyph)c : '.';

+        Glyph g = orca_is_valid_glyph(c) ? (Glyph)c : '.';

         gbuffer_poke(gbuffer, height, width, y, x, g);

         if (x > max_x)

           max_x = x;

--- a/tui_main.c

+++ b/tui_main.c

@@ -3622,7 +3622,7 @@

       }

       if (key != ' ') {

         char cleaned = (char)key;

-        if (!is_valid_glyph((Glyph)key))

+        if (!orca_is_valid_glyph((Glyph)key))

           cleaned = '.';

         if (brackpaste_y < t.ged.field.height &&

             brackpaste_x < t.ged.field.width) {

@@ -3870,7 +3870,7 @@

     break;

   default:

-    if (key >= CHAR_MIN && key <= CHAR_MAX && is_valid_glyph((Glyph)key))

+    if (key >= CHAR_MIN && key <= CHAR_MAX && orca_is_valid_glyph((Glyph)key))

       ged_input_character(&t.ged, (char)key);

 #if 0

       else