dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Vadim Grigoruk
2018-09-03 12:13:02 +03:00
parent e9cae7ad45
commit ed6d14284e
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/system.c
View File

@@ -66,6 +66,12 @@ static struct
} texture; } texture;
bool state[tic_keys_count]; bool state[tic_keys_count];
struct
{
bool state[tic_keys_count];
} touch;
} keyboard; } keyboard;
u32 touchCounter; u32 touchCounter;
@@ -418,8 +424,33 @@ static void processKeyboard()
enum{BufSize = COUNT_OF(input->keyboard.keys)}; enum{BufSize = COUNT_OF(input->keyboard.keys)};
for(s32 i = 0, c = 0; i < COUNT_OF(platform.keyboard.state) && c < BufSize; i++) for(s32 i = 0, c = 0; i < COUNT_OF(platform.keyboard.state) && c < BufSize; i++)
if(platform.keyboard.state[i]) if(platform.keyboard.state[i] || platform.keyboard.touch.state[i])
input->keyboard.keys[c++] = i; input->keyboard.keys[c++] = i;
if(input->keyboard.text == 0)
{
static const char Symbols[] = " abcdefghijklmnopqrstuvwxyz0123456789-=[]\\;'`,./ ";
static const char Shift[] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ)!@#$%^&*(_+{}|:\"~<>? ";
enum{Count = sizeof Symbols};
for(s32 i = 0; i < TIC80_KEY_BUFFER; i++)
{
tic_key key = tic->ram.input.keyboard.keys[i];
if(key > 0 && key < Count && tic->api.keyp(tic, key, KEYBOARD_HOLD, KEYBOARD_PERIOD))
{
bool caps = tic->api.key(tic, tic_key_capslock);
bool shift = tic->api.key(tic, tic_key_shift);
input->keyboard.text = caps
? key >= tic_key_a && key <= tic_key_z
? shift ? Symbols[key] : Shift[key]
: shift ? Shift[key] : Symbols[key]
: shift ? Shift[key] : Symbols[key];
}
}
}
} }
#if !defined(__EMSCRIPTEN__) && !defined(__MACOSX__) #if !defined(__EMSCRIPTEN__) && !defined(__MACOSX__)
@@ -498,6 +529,8 @@ static void processTouchKeyboard()
enum {BufSize = COUNT_OF(input->keyboard.keys)}; enum {BufSize = COUNT_OF(input->keyboard.keys)};
SDL_memset(&platform.keyboard.touch.state, 0, sizeof platform.keyboard.touch.state);
for (s32 i = 0; i < devices; i++) for (s32 i = 0; i < devices; i++)
{ {
SDL_TouchID id = SDL_GetTouchDevice(i); SDL_TouchID id = SDL_GetTouchDevice(i);
@@ -519,40 +552,7 @@ static void processTouchKeyboard()
pt.x /= scale; pt.x /= scale;
pt.y /= scale; pt.y /= scale;
for(s32 i = 0; i < BufSize; i++) platform.keyboard.touch.state[KbdLayout[pt.x / TIC_SPRITESIZE + pt.y / TIC_SPRITESIZE * Cols]] = true;
{
tic_key* key = &input->keyboard.keys[i];
if(*key == tic_key_unknown)
{
*key = KbdLayout[pt.x / TIC_SPRITESIZE + pt.y / TIC_SPRITESIZE * Cols];
if(input->keyboard.text == 0)
{
static const char Symbols[] = " abcdefghijklmnopqrstuvwxyz0123456789-=[]\\;'`,./ ";
static const char Shift[] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ)!@#$%^&*(_+{}|:\"~<>? ";
enum{Count = sizeof Symbols};
for(s32 i = 0; i < TIC80_KEY_BUFFER; i++)
{
tic_key key = tic->ram.input.keyboard.keys[i];
if(key > 0 && key < Count && tic->api.keyp(tic, key, KEYBOARD_HOLD, KEYBOARD_PERIOD))
{
bool caps = tic->api.key(tic, tic_key_capslock);
bool shift = tic->api.key(tic, tic_key_shift);
input->keyboard.text = caps
? key >= tic_key_a && key <= tic_key_z
? shift ? Symbols[key] : Shift[key]
: shift ? Shift[key] : Symbols[key]
: shift ? Shift[key] : Symbols[key];
}
}
}
break;
}
}
} }
} }
} }
@@ -855,8 +855,8 @@ static void pollEvent()
} }
processMouse(); processMouse();
processKeyboard();
processTouchInput(); processTouchInput();
processKeyboard();
processGamepad(); processGamepad();
} }