Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 21:47:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] kb: rename key code arrays from xfree86_* to linux_*

Browse Source 
We are using Linux key codes defined in input-event-codes.h, not XFree86
stuff.
This commit is contained in:
Quantum 2021-08-17 04:41:21 -04:00 committed by Geoffrey McRae
parent ccda264648
commit 1c7d14169e
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app.c
View File

@ -333,7 +333,7 @@ void app_handleKeyPress(int sc)
if (!g_state.keyDown[sc]) if (!g_state.keyDown[sc])
{ {
uint32_t ps2 = xfree86_to_ps2[sc]; uint32_t ps2 = linux_to_ps2[sc];
if (!ps2) if (!ps2)
return; return;
@ -386,7 +386,7 @@ void app_handleKeyRelease(int sc)
if (g_params.ignoreWindowsKeys && (sc == KEY_LEFTMETA || sc == KEY_RIGHTMETA)) if (g_params.ignoreWindowsKeys && (sc == KEY_LEFTMETA || sc == KEY_RIGHTMETA))
return; return;
uint32_t ps2 = xfree86_to_ps2[sc]; uint32_t ps2 = linux_to_ps2[sc];
if (!ps2) if (!ps2)
return; return;

2
client/src/config.c
View File

@ -790,7 +790,7 @@ static char * optScancodeToString(struct Option * opt)
{ {
char * str; char * str;
alloc_sprintf(&str, "%d = %s", opt->value.x_int, alloc_sprintf(&str, "%d = %s", opt->value.x_int,
xfree86_to_str[opt->value.x_int]); linux_to_str[opt->value.x_int]);
return str; return str;
} }

6
client/src/kb.c
View File

@ -21,7 +21,7 @@
#include "kb.h" #include "kb.h"
#include "cimgui.h" #include "cimgui.h"
const uint32_t xfree86_to_ps2[KEY_MAX] = const uint32_t linux_to_ps2[KEY_MAX] =
{ {
[KEY_RESERVED] /* = USB 0 */ = 0x000000, [KEY_RESERVED] /* = USB 0 */ = 0x000000,
[KEY_ESC] /* = USB 41 */ = 0x000001, [KEY_ESC] /* = USB 41 */ = 0x000001,
@ -144,7 +144,7 @@ const uint32_t xfree86_to_ps2[KEY_MAX] =
[KEY_PRINT] /* = USB 70 */ = 0x00E037, [KEY_PRINT] /* = USB 70 */ = 0x00E037,
}; };
const char * xfree86_to_str[KEY_MAX] = const char * linux_to_str[KEY_MAX] =
{ {
[KEY_RESERVED] = "KEY_RESERVED", [KEY_RESERVED] = "KEY_RESERVED",
[KEY_ESC] = "KEY_ESC", [KEY_ESC] = "KEY_ESC",
@ -267,7 +267,7 @@ const char * xfree86_to_str[KEY_MAX] =
[KEY_PRINT] = "KEY_PRINT", [KEY_PRINT] = "KEY_PRINT",
}; };
const char * xfree86_to_display[KEY_MAX] = const char * linux_to_display[KEY_MAX] =
{ {
[KEY_RESERVED] = "Reserved", [KEY_RESERVED] = "Reserved",
[KEY_ESC] = "Esc", [KEY_ESC] = "Esc",

6
client/src/kb.h
View File

@ -24,9 +24,9 @@
#include <linux/input.h> #include <linux/input.h>
#include <stdint.h> #include <stdint.h>
extern const uint32_t xfree86_to_ps2[KEY_MAX]; extern const uint32_t linux_to_ps2[KEY_MAX];
extern const char * xfree86_to_str[KEY_MAX]; extern const char * linux_to_str[KEY_MAX];
extern const char * xfree86_to_display[KEY_MAX]; extern const char * linux_to_display[KEY_MAX];
void initImGuiKeyMap(int * keymap); void initImGuiKeyMap(int * keymap);

8
client/src/keybind.c
View File

@ -104,9 +104,9 @@ static void bind_mouseSens(int sc, void * opaque)
static void bind_ctrlAltFn(int sc, void * opaque) static void bind_ctrlAltFn(int sc, void * opaque)
{ {
const uint32_t ctrl = xfree86_to_ps2[KEY_LEFTCTRL]; const uint32_t ctrl = linux_to_ps2[KEY_LEFTCTRL];
const uint32_t alt = xfree86_to_ps2[KEY_LEFTALT ]; const uint32_t alt = linux_to_ps2[KEY_LEFTALT ];
const uint32_t fn = xfree86_to_ps2[sc]; const uint32_t fn = linux_to_ps2[sc];
spice_key_down(ctrl); spice_key_down(ctrl);
spice_key_down(alt ); spice_key_down(alt );
spice_key_down(fn ); spice_key_down(fn );
@ -118,7 +118,7 @@ static void bind_ctrlAltFn(int sc, void * opaque)
static void bind_passthrough(int sc, void * opaque) static void bind_passthrough(int sc, void * opaque)
{ {
sc = xfree86_to_ps2[sc]; sc = linux_to_ps2[sc];
spice_key_down(sc); spice_key_down(sc);
spice_key_up (sc); spice_key_up (sc);
} }

4
client/src/overlay/help.c
View File

@ -56,7 +56,7 @@ static int help_render(void * udata, bool interactive, struct Rect * windowRects
if (igBeginTable("Help", 2, 0, (ImVec2) { 0.0f, 0.0f }, 0.0f)) if (igBeginTable("Help", 2, 0, (ImVec2) { 0.0f, 0.0f }, 0.0f))
{ {
const char * escapeName = xfree86_to_display[g_params.escapeKey]; const char * escapeName = linux_to_display[g_params.escapeKey];
igTableNextColumn(); igTableNextColumn();
igText("%s", escapeName); igText("%s", escapeName);
@ -67,7 +67,7 @@ static int help_render(void * udata, bool interactive, struct Rect * windowRects
if (g_state.keyDescription[i]) if (g_state.keyDescription[i])
{ {
igTableNextColumn(); igTableNextColumn();
igText("%s+%s", escapeName, xfree86_to_display[i]); igText("%s+%s", escapeName, linux_to_display[i]);
igTableNextColumn(); igTableNextColumn();
igText(g_state.keyDescription[i]); igText(g_state.keyDescription[i]);
} }