Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] all: move keybind implementation into app.c/h

Browse Source
This commit is contained in:
Geoffrey McRae
2021-01-26 02:33:28 +11:00
parent 9674421ce4
commit 3d03699cc8
6 changed files with 88 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/app.c
View File

@@ -55,7 +55,7 @@ void app_alert(LG_MsgAlert type, const char * fmt, ...)
free(buffer);
}
KeybindHandle app_register_keybind(SDL_Scancode key, SuperEventFn callback, void * opaque)
KeybindHandle app_registerKeybind(SDL_Scancode key, SuperEventFn callback, void * opaque)
{
// don't allow duplicate binds
if (g_state.bindings[key])
@@ -73,7 +73,7 @@ KeybindHandle app_register_keybind(SDL_Scancode key, SuperEventFn callback, void
return handle;
}
void app_release_keybind(KeybindHandle * handle)
void app_releaseKeybind(KeybindHandle * handle)
{
if (!*handle)
return;
@@ -83,6 +83,16 @@ void app_release_keybind(KeybindHandle * handle)
*handle = NULL;
}
void app_releaseAllKeybinds(void)
{
for(int i = 0; i < KEY_MAX; ++i)
if (g_state.bindings[i])
{
free(g_state.bindings[i]);
g_state.bindings[i] = NULL;
}
}
bool app_getProp(LG_DSProperty prop, void * ret)
{
return g_state.ds->getProp(prop, ret);

58
client/src/main.c
View File

@@ -745,49 +745,35 @@ static void key_passthrough(uint32_t sc, void * opaque)
static void register_key_binds(void)
{
g_state.kbFS = app_register_keybind(KEY_F , toggle_fullscreen, NULL);
g_state.kbVideo = app_register_keybind(KEY_V , toggle_video , NULL);
g_state.kbRotate = app_register_keybind(KEY_R , toggle_rotate , NULL);
g_state.kbQuit = app_register_keybind(KEY_Q , quit , NULL);
app_registerKeybind(KEY_F, toggle_fullscreen, NULL);
app_registerKeybind(KEY_V, toggle_video , NULL);
app_registerKeybind(KEY_R, toggle_rotate , NULL);
app_registerKeybind(KEY_Q, quit , NULL);
if (g_params.useSpiceInput)
{
g_state.kbInput = app_register_keybind(KEY_I , toggle_input , NULL);
g_state.kbMouseSensInc = app_register_keybind(KEY_INSERT, mouse_sens_inc , NULL);
g_state.kbMouseSensDec = app_register_keybind(KEY_DELETE, mouse_sens_dec , NULL);
app_registerKeybind(KEY_I , toggle_input , NULL);
app_registerKeybind(KEY_INSERT, mouse_sens_inc , NULL);
app_registerKeybind(KEY_DELETE, mouse_sens_dec , NULL);
g_state.kbCtrlAltFn[0 ] = app_register_keybind(KEY_F1 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[1 ] = app_register_keybind(KEY_F2 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[2 ] = app_register_keybind(KEY_F3 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[3 ] = app_register_keybind(KEY_F4 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[4 ] = app_register_keybind(KEY_F5 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[5 ] = app_register_keybind(KEY_F6 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[6 ] = app_register_keybind(KEY_F7 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[7 ] = app_register_keybind(KEY_F8 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[8 ] = app_register_keybind(KEY_F9 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[9 ] = app_register_keybind(KEY_F10, ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[10] = app_register_keybind(KEY_F11, ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[11] = app_register_keybind(KEY_F12, ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F1 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F2 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F3 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F4 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F5 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F6 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F7 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F8 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F9 , ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F10, ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F11, ctrl_alt_fn, NULL);
app_registerKeybind(KEY_F12, ctrl_alt_fn, NULL);
g_state.kbPass[0] = app_register_keybind(KEY_LEFTMETA , key_passthrough, NULL);
g_state.kbPass[1] = app_register_keybind(KEY_RIGHTMETA, key_passthrough, NULL);
app_registerKeybind(KEY_LEFTMETA , key_passthrough, NULL);
app_registerKeybind(KEY_RIGHTMETA, key_passthrough, NULL);
}
}
static void release_key_binds(void)
{
app_release_keybind(&g_state.kbFS );
app_release_keybind(&g_state.kbVideo);
app_release_keybind(&g_state.kbInput);
app_release_keybind(&g_state.kbQuit );
app_release_keybind(&g_state.kbMouseSensInc);
app_release_keybind(&g_state.kbMouseSensDec);
for(int i = 0; i < 12; ++i)
app_release_keybind(&g_state.kbCtrlAltFn[i]);
for(int i = 0; i < 2; ++i)
app_release_keybind(&g_state.kbPass[i]);
}
static void initSDLCursor(void)
{
const uint8_t data[4] = {0xf, 0x9, 0x9, 0xf};
@@ -1245,7 +1231,7 @@ static void lg_shutdown(void)
ivshmemClose(&g_state.shm);
release_key_binds();
app_releaseAllKeybinds();
SDL_Quit();
}

11
client/src/main.h
View File

@@ -22,7 +22,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <SDL2/SDL.h>
#include <linux/input.h>
#include "interface/app.h"
#include "dynamic/displayservers.h"
#include "dynamic/renderers.h"
@@ -92,16 +91,6 @@ struct AppState
uint64_t resizeTimeout;
bool resizeDone;
KeybindHandle kbFS;
KeybindHandle kbVideo;
KeybindHandle kbRotate;
KeybindHandle kbInput;
KeybindHandle kbQuit;
KeybindHandle kbMouseSensInc;
KeybindHandle kbMouseSensDec;
KeybindHandle kbCtrlAltFn[12];
KeybindHandle kbPass[2];
};
struct AppParams