os -> wm; *_w32_ -> w32_*_, *_lnx_ -> lnx_*_

This commit is contained in:
Ryan Fleury
2026-05-08 21:17:21 -07:00
parent 9a7782de47
commit 2f6d0f9aaa
52 changed files with 3086 additions and 3115 deletions
+7 -7
View File
@@ -24,21 +24,21 @@ cfg_key_map_from_cfg(Arena *arena)
for(CFG_Node *child = keybinding->first; child != &cfg_nil_node; child = child->next)
{
if(0){}
else if(str8_match(child->string, str8_lit("ctrl"), 0)) { binding.modifiers |= OS_Modifier_Ctrl; }
else if(str8_match(child->string, str8_lit("alt"), 0)) { binding.modifiers |= OS_Modifier_Alt; }
else if(str8_match(child->string, str8_lit("shift"), 0)) { binding.modifiers |= OS_Modifier_Shift; }
else if(str8_match(child->string, str8_lit("ctrl"), 0)) { binding.modifiers |= WM_Modifier_Ctrl; }
else if(str8_match(child->string, str8_lit("alt"), 0)) { binding.modifiers |= WM_Modifier_Alt; }
else if(str8_match(child->string, str8_lit("shift"), 0)) { binding.modifiers |= WM_Modifier_Shift; }
else
{
OS_Key key = OS_Key_Null;
for EachEnumVal(OS_Key, k)
WM_Key key = WM_Key_Null;
for EachEnumVal(WM_Key, k)
{
if(str8_match(child->string, os_g_key_cfg_string_table[k], StringMatchFlag_CaseInsensitive))
if(str8_match(child->string, wm_key_cfg_name_table[k], StringMatchFlag_CaseInsensitive))
{
key = k;
break;
}
}
if(key != OS_Key_Null)
if(key != WM_Key_Null)
{
binding.key = key;
}
+2 -2
View File
@@ -7,8 +7,8 @@
typedef struct CFG_Binding CFG_Binding;
struct CFG_Binding
{
OS_Key key;
OS_Modifiers modifiers;
WM_Key key;
WM_Modifiers modifiers;
};
typedef struct CFG_KeyMapNode CFG_KeyMapNode;
+1 -1
View File
@@ -3,6 +3,6 @@
#include "config_core.c"
#include "config_panels.c"
#if defined(OS_GFX_H)
#if defined(WINDOW_MANAGER_H)
# include "config_bindings.c"
#endif
+1 -1
View File
@@ -6,7 +6,7 @@
#include "config_core.h"
#include "config_panels.h"
#if defined(OS_GFX_H)
#if defined(WINDOW_MANAGER_H)
# include "config_bindings.h"
#endif