Browse Source

Cleanup

master
cancel 5 years ago
parent
commit
7f66ba4f22
  1. 2
      base.h
  2. 2
      sysmisc.c
  3. 4
      tui_main.c

2
base.h

@ -91,7 +91,7 @@ ORCA_FORCEINLINE static Usz orca_round_up_power2(Usz x) {
} }
ORCA_OK_IF_UNUSED ORCA_OK_IF_UNUSED
static bool is_valid_glyph(Glyph c) { static bool orca_is_valid_glyph(Glyph c) {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
return true; return true;
if (c >= 'A' && c <= 'Z') if (c >= 'A' && c <= 'Z')

2
sysmisc.c

@ -51,7 +51,7 @@ Cboard_error cboard_paste(Glyph *gbuffer, Usz height, Usz width, Usz y, Usz x,
continue; continue;
} }
if (c != ' ' && y < height && x < width) { 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); gbuffer_poke(gbuffer, height, width, y, x, g);
if (x > max_x) if (x > max_x)
max_x = x; max_x = x;

4
tui_main.c

@ -3622,7 +3622,7 @@ event_loop:;
} }
if (key != ' ') { if (key != ' ') {
char cleaned = (char)key; char cleaned = (char)key;
if (!is_valid_glyph((Glyph)key)) if (!orca_is_valid_glyph((Glyph)key))
cleaned = '.'; cleaned = '.';
if (brackpaste_y < t.ged.field.height && if (brackpaste_y < t.ged.field.height &&
brackpaste_x < t.ged.field.width) { brackpaste_x < t.ged.field.width) {
@ -3870,7 +3870,7 @@ event_loop:;
break; break;
default: 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); ged_input_character(&t.ged, (char)key);
#if 0 #if 0
else else

Loading…
Cancel
Save