[client] app: replace old SDL_Scancode with int

client/src/app.c

@@ -55,21 +55,21 @@ void app_alert(LG_MsgAlert type, const char * fmt, ...)
   free(buffer);
 }
 
-KeybindHandle app_registerKeybind(SDL_Scancode key, SuperEventFn callback, void * opaque)
+KeybindHandle app_registerKeybind(int sc, SuperEventFn callback, void * opaque)
 {
   // don't allow duplicate binds
-  if (g_state.bindings[key])
+  if (g_state.bindings[sc])
   {
     DEBUG_INFO("Key already bound");
     return NULL;
   }
 
   KeybindHandle handle = (KeybindHandle)malloc(sizeof(struct KeybindHandle));
-  handle->key      = key;
+  handle->sc       = sc;
   handle->callback = callback;
   handle->opaque   = opaque;
 
-  g_state.bindings[key] = handle;
+  g_state.bindings[sc] = handle;
   return handle;
 }
 
@@ -78,7 +78,7 @@ void app_releaseKeybind(KeybindHandle * handle)
   if (!*handle)
     return;
 
-  g_state.bindings[(*handle)->key] = NULL;
+  g_state.bindings[(*handle)->sc] = NULL;
   free(*handle);
   *handle = NULL;
 }

client/src/main.c

@@ -1231,6 +1231,7 @@ static void lg_shutdown(void)
 
   ivshmemClose(&g_state.shm);
 
+  // this must run last to ensure that we don't free any pointers still in use
   app_releaseAllKeybinds();
 
   SDL_Quit();

client/src/main.h

@@ -154,7 +154,7 @@ struct CBRequest
 
 struct KeybindHandle
 {
-  SDL_Scancode   key;
+  int            sc;
   SuperEventFn   callback;
   void         * opaque;
 };