sokol: added keyboard handling
This commit is contained in:
Vadim Grigoruk
parent
365bc1e5e5
commit
de0b0865ca
|
|
@ -10,30 +10,45 @@ static struct
|
|||
{
|
||||
Studio* studio;
|
||||
|
||||
struct
|
||||
{
|
||||
bool state[tic_keys_count];
|
||||
} keyboard;
|
||||
|
||||
struct
|
||||
{
|
||||
saudio_desc desc;
|
||||
float* samples;
|
||||
} audio;
|
||||
|
||||
char* clipboard;
|
||||
|
||||
} platform;
|
||||
|
||||
static void setClipboardText(const char* text)
|
||||
{
|
||||
if(platform.clipboard)
|
||||
{
|
||||
free(platform.clipboard);
|
||||
platform.clipboard = NULL;
|
||||
}
|
||||
|
||||
platform.clipboard = strdup(text);
|
||||
}
|
||||
|
||||
static bool hasClipboardText()
|
||||
{
|
||||
return false;
|
||||
return platform.clipboard != NULL;
|
||||
}
|
||||
|
||||
static char* getClipboardText()
|
||||
{
|
||||
return NULL;
|
||||
return platform.clipboard ? strdup(platform.clipboard) : NULL;
|
||||
}
|
||||
|
||||
static void freeClipboardText(const char* text)
|
||||
{
|
||||
free((void*)text);
|
||||
}
|
||||
|
||||
static u64 getPerformanceCounter()
|
||||
|
|
@ -121,6 +136,20 @@ static void app_init(void)
|
|||
platform.audio.samples = calloc(sizeof platform.audio.samples[0], saudio_sample_rate() / TIC_FRAMERATE * TIC_STEREO_CHANNLES);
|
||||
}
|
||||
|
||||
static void handleKeyboard()
|
||||
{
|
||||
tic_mem* tic = platform.studio->tic;
|
||||
|
||||
tic80_input* input = &tic->ram.input;
|
||||
input->keyboard.data = 0;
|
||||
|
||||
enum{BufSize = COUNT_OF(input->keyboard.keys)};
|
||||
|
||||
for(s32 i = 0, c = 0; i < COUNT_OF(platform.keyboard.state) && c < BufSize; i++)
|
||||
if(platform.keyboard.state[i])
|
||||
input->keyboard.keys[c++] = i;
|
||||
}
|
||||
|
||||
static void app_frame(void)
|
||||
{
|
||||
tic_mem* tic = platform.studio->tic;
|
||||
|
|
@ -130,6 +159,8 @@ static void app_frame(void)
|
|||
return;
|
||||
}
|
||||
|
||||
tic->ram.input.gamepads.data = 0;
|
||||
handleKeyboard();
|
||||
platform.studio->tick();
|
||||
|
||||
sokol_gfx_draw(platform.studio->tic->screen);
|
||||
|
|
@ -141,9 +172,202 @@ static void app_frame(void)
|
|||
saudio_push(platform.audio.samples, count / 2);
|
||||
}
|
||||
|
||||
static void handleKeydown(sapp_keycode keycode, bool down)
|
||||
{
|
||||
static const tic_keycode KeyboardCodes[] =
|
||||
{
|
||||
[SAPP_KEYCODE_INVALID] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_SPACE] = tic_key_space,
|
||||
[SAPP_KEYCODE_APOSTROPHE] = tic_key_apostrophe,
|
||||
[SAPP_KEYCODE_COMMA] = tic_key_comma,
|
||||
[SAPP_KEYCODE_MINUS] = tic_key_minus,
|
||||
[SAPP_KEYCODE_PERIOD] = tic_key_period,
|
||||
[SAPP_KEYCODE_SLASH] = tic_key_slash,
|
||||
[SAPP_KEYCODE_0] = tic_key_0,
|
||||
[SAPP_KEYCODE_1] = tic_key_1,
|
||||
[SAPP_KEYCODE_2] = tic_key_2,
|
||||
[SAPP_KEYCODE_3] = tic_key_3,
|
||||
[SAPP_KEYCODE_4] = tic_key_4,
|
||||
[SAPP_KEYCODE_5] = tic_key_5,
|
||||
[SAPP_KEYCODE_6] = tic_key_6,
|
||||
[SAPP_KEYCODE_7] = tic_key_7,
|
||||
[SAPP_KEYCODE_8] = tic_key_8,
|
||||
[SAPP_KEYCODE_9] = tic_key_9,
|
||||
[SAPP_KEYCODE_SEMICOLON] = tic_key_semicolon,
|
||||
[SAPP_KEYCODE_EQUAL] = tic_key_equals,
|
||||
[SAPP_KEYCODE_A] = tic_key_a,
|
||||
[SAPP_KEYCODE_B] = tic_key_b,
|
||||
[SAPP_KEYCODE_C] = tic_key_c,
|
||||
[SAPP_KEYCODE_D] = tic_key_d,
|
||||
[SAPP_KEYCODE_E] = tic_key_e,
|
||||
[SAPP_KEYCODE_F] = tic_key_f,
|
||||
[SAPP_KEYCODE_G] = tic_key_g,
|
||||
[SAPP_KEYCODE_H] = tic_key_h,
|
||||
[SAPP_KEYCODE_I] = tic_key_i,
|
||||
[SAPP_KEYCODE_J] = tic_key_j,
|
||||
[SAPP_KEYCODE_K] = tic_key_k,
|
||||
[SAPP_KEYCODE_L] = tic_key_l,
|
||||
[SAPP_KEYCODE_M] = tic_key_m,
|
||||
[SAPP_KEYCODE_N] = tic_key_n,
|
||||
[SAPP_KEYCODE_O] = tic_key_o,
|
||||
[SAPP_KEYCODE_P] = tic_key_p,
|
||||
[SAPP_KEYCODE_Q] = tic_key_q,
|
||||
[SAPP_KEYCODE_R] = tic_key_r,
|
||||
[SAPP_KEYCODE_S] = tic_key_s,
|
||||
[SAPP_KEYCODE_T] = tic_key_t,
|
||||
[SAPP_KEYCODE_U] = tic_key_u,
|
||||
[SAPP_KEYCODE_V] = tic_key_v,
|
||||
[SAPP_KEYCODE_W] = tic_key_w,
|
||||
[SAPP_KEYCODE_X] = tic_key_x,
|
||||
[SAPP_KEYCODE_Y] = tic_key_y,
|
||||
[SAPP_KEYCODE_Z] = tic_key_z,
|
||||
[SAPP_KEYCODE_LEFT_BRACKET] = tic_key_leftbracket,
|
||||
[SAPP_KEYCODE_BACKSLASH] = tic_key_backslash,
|
||||
[SAPP_KEYCODE_RIGHT_BRACKET] = tic_key_rightbracket,
|
||||
[SAPP_KEYCODE_GRAVE_ACCENT] = tic_key_grave,
|
||||
[SAPP_KEYCODE_WORLD_1] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_WORLD_2] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_ESCAPE] = tic_key_escape,
|
||||
[SAPP_KEYCODE_ENTER] = tic_key_return,
|
||||
[SAPP_KEYCODE_TAB] = tic_key_tab,
|
||||
[SAPP_KEYCODE_BACKSPACE] = tic_key_backspace,
|
||||
[SAPP_KEYCODE_INSERT] = tic_key_insert,
|
||||
[SAPP_KEYCODE_DELETE] = tic_key_delete,
|
||||
[SAPP_KEYCODE_RIGHT] = tic_key_right,
|
||||
[SAPP_KEYCODE_LEFT] = tic_key_left,
|
||||
[SAPP_KEYCODE_DOWN] = tic_key_down,
|
||||
[SAPP_KEYCODE_UP] = tic_key_up,
|
||||
[SAPP_KEYCODE_PAGE_UP] = tic_key_pageup,
|
||||
[SAPP_KEYCODE_PAGE_DOWN] = tic_key_pagedown,
|
||||
[SAPP_KEYCODE_HOME] = tic_key_home,
|
||||
[SAPP_KEYCODE_END] = tic_key_end,
|
||||
[SAPP_KEYCODE_CAPS_LOCK] = tic_key_capslock,
|
||||
[SAPP_KEYCODE_SCROLL_LOCK] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_NUM_LOCK] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_PRINT_SCREEN] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_PAUSE] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F1] = tic_key_f1,
|
||||
[SAPP_KEYCODE_F2] = tic_key_f2,
|
||||
[SAPP_KEYCODE_F3] = tic_key_f3,
|
||||
[SAPP_KEYCODE_F4] = tic_key_f4,
|
||||
[SAPP_KEYCODE_F5] = tic_key_f5,
|
||||
[SAPP_KEYCODE_F6] = tic_key_f6,
|
||||
[SAPP_KEYCODE_F7] = tic_key_f7,
|
||||
[SAPP_KEYCODE_F8] = tic_key_f8,
|
||||
[SAPP_KEYCODE_F9] = tic_key_f9,
|
||||
[SAPP_KEYCODE_F10] = tic_key_f10,
|
||||
[SAPP_KEYCODE_F11] = tic_key_f11,
|
||||
[SAPP_KEYCODE_F12] = tic_key_f12,
|
||||
[SAPP_KEYCODE_F13] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F14] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F15] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F16] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F17] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F18] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F19] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F20] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F21] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F22] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F23] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F24] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_F25] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_KP_0] = tic_key_0,
|
||||
[SAPP_KEYCODE_KP_1] = tic_key_1,
|
||||
[SAPP_KEYCODE_KP_2] = tic_key_2,
|
||||
[SAPP_KEYCODE_KP_3] = tic_key_3,
|
||||
[SAPP_KEYCODE_KP_4] = tic_key_4,
|
||||
[SAPP_KEYCODE_KP_5] = tic_key_5,
|
||||
[SAPP_KEYCODE_KP_6] = tic_key_6,
|
||||
[SAPP_KEYCODE_KP_7] = tic_key_7,
|
||||
[SAPP_KEYCODE_KP_8] = tic_key_8,
|
||||
[SAPP_KEYCODE_KP_9] = tic_key_9,
|
||||
[SAPP_KEYCODE_KP_DECIMAL] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_KP_DIVIDE] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_KP_MULTIPLY] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_KP_SUBTRACT] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_KP_ADD] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_KP_ENTER] = tic_key_return,
|
||||
[SAPP_KEYCODE_KP_EQUAL] = tic_key_equals,
|
||||
[SAPP_KEYCODE_LEFT_SHIFT] = tic_key_shift,
|
||||
[SAPP_KEYCODE_LEFT_CONTROL] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_LEFT_ALT] = tic_key_alt,
|
||||
[SAPP_KEYCODE_LEFT_SUPER] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_RIGHT_SHIFT] = tic_key_shift,
|
||||
[SAPP_KEYCODE_RIGHT_CONTROL] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_RIGHT_ALT] = tic_key_alt,
|
||||
[SAPP_KEYCODE_RIGHT_SUPER] = tic_key_unknown,
|
||||
[SAPP_KEYCODE_MENU] = tic_key_unknown,
|
||||
|
||||
};
|
||||
|
||||
if(KeyboardCodes[keycode] > tic_key_unknown)
|
||||
{
|
||||
platform.keyboard.state[KeyboardCodes[keycode]] = down;
|
||||
}
|
||||
}
|
||||
|
||||
static void calcViewportSize(tic_rect* rect)
|
||||
{
|
||||
enum{Width = TIC80_WIDTH, Height = TIC80_HEIGHT};
|
||||
|
||||
if (rect->w * Height < rect->h * Width)
|
||||
{
|
||||
s32 discreteWidth = rect->w;// - rect->w % Width;
|
||||
s32 discreteHeight = Height * discreteWidth / Width;
|
||||
|
||||
rect->x = (rect->w - discreteWidth) / 2;
|
||||
|
||||
rect->y = rect->w > rect->h
|
||||
? (rect->h - discreteHeight) / 2
|
||||
: OFFSET_TOP*discreteWidth/Width;
|
||||
|
||||
rect->w = discreteWidth;
|
||||
rect->h = discreteHeight;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
s32 discreteHeight = rect->h;// - rect->h % Height;
|
||||
s32 discreteWidth = Width * discreteHeight / Height;
|
||||
|
||||
rect->x = (rect->w - discreteWidth) / 2;
|
||||
rect->y = (rect->h - discreteHeight) / 2;
|
||||
|
||||
rect->w = discreteWidth;
|
||||
rect->h = discreteHeight;
|
||||
}
|
||||
}
|
||||
|
||||
static void app_input(const sapp_event* event)
|
||||
{
|
||||
tic80_input* input = &platform.studio->tic->ram.input;
|
||||
|
||||
switch(event->type)
|
||||
{
|
||||
case SAPP_EVENTTYPE_KEY_DOWN:
|
||||
handleKeydown(event->key_code, true);
|
||||
break;
|
||||
case SAPP_EVENTTYPE_KEY_UP:
|
||||
handleKeydown(event->key_code, false);
|
||||
break;
|
||||
case SAPP_EVENTTYPE_MOUSE_MOVE:
|
||||
|
||||
{
|
||||
|
||||
}
|
||||
// if(rect.w) x = (mx - rect.x) * TIC80_WIDTH / rect.w;
|
||||
// if(rect.h) y = (my - rect.y) * TIC80_HEIGHT / rect.h;
|
||||
|
||||
input->mouse.x = event->mouse_x >= 0 && event->mouse_x < 0xff ? event->mouse_x : 0xff;
|
||||
input->mouse.y = event->mouse_y >= 0 && event->mouse_y < 0xff ? event->mouse_y : 0xff;
|
||||
break;
|
||||
case SAPP_EVENTTYPE_MOUSE_DOWN:
|
||||
break;
|
||||
case SAPP_EVENTTYPE_MOUSE_UP:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void app_cleanup(void)
|
||||
|
|
@ -173,6 +397,7 @@ sapp_desc sokol_main(s32 argc, char* argv[])
|
|||
.width = Width,
|
||||
.height = Height,
|
||||
.window_title = TIC_TITLE,
|
||||
.ios_keyboard_resizes_canvas = true
|
||||
.ios_keyboard_resizes_canvas = true,
|
||||
.high_dpi = true,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -197,25 +197,23 @@ static void apply_viewport(void) {
|
|||
const int canvas_height = sapp_height();
|
||||
const float canvas_aspect = (float)canvas_width / (float)canvas_height;
|
||||
const float fb_aspect = (float)(sokol_gfx.fb_width*sokol_gfx.fb_aspect_scale_x) / (float)(sokol_gfx.fb_height*sokol_gfx.fb_aspect_scale_y);
|
||||
const int frame_x = 5;
|
||||
const int frame_y = 5;
|
||||
int vp_x, vp_y, vp_w, vp_h;
|
||||
if (fb_aspect < canvas_aspect) {
|
||||
vp_y = frame_y;
|
||||
vp_h = canvas_height - 2 * frame_y;
|
||||
vp_w = (int) (canvas_height * fb_aspect) - 2 * frame_x;
|
||||
vp_y = 0;
|
||||
vp_h = canvas_height;
|
||||
vp_w = (int) (canvas_height * fb_aspect);
|
||||
vp_x = (canvas_width - vp_w) / 2;
|
||||
}
|
||||
else {
|
||||
vp_x = frame_x;
|
||||
vp_w = canvas_width - 2 * frame_x;
|
||||
vp_h = (int) (canvas_width / fb_aspect) - 2 * frame_y;
|
||||
vp_x = 0;
|
||||
vp_w = canvas_width;
|
||||
vp_h = (int) (canvas_width / fb_aspect);
|
||||
|
||||
// align top
|
||||
// vp_y = frame_y;
|
||||
vp_y = 0;
|
||||
|
||||
// align vcenter
|
||||
vp_y = (canvas_height - vp_h) / 2;
|
||||
//vp_y = (canvas_height - vp_h) / 2;
|
||||
}
|
||||
sg_apply_viewport(vp_x, vp_y, vp_w, vp_h, true);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue