erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-25 00:57:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

[common] resolve hints and warnings

Browse source
This commit is contained in:
Marc Durdin 2018-11-19 07:20:07 +11:00
parent becbfeda47
commit d0f84fa082
8 changed files with 67 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/engine/keyboardprocessor/include/kmx/kmx_processor.h
View file

@ -127,7 +127,7 @@ private:
KMX_BOOL VerifyChecksum(PKMX_BYTE buf, KMX_DWORD sz);
PKMX_WCHAR StringOffset(PKMX_BYTE base, KMX_DWORD offset);
#ifdef KMX_64BIT
LPKEYBOARD CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFileSize);
LPKEYBOARD CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base);
#endif
KMX_BOOL ReleaseKeyboardMemory(LPKEYBOARD kbd);
@ -215,10 +215,10 @@ extern KMX_BOOL g_debug_ToConsole, g_debug_KeymanLog, g_silent;
#endif
int DebugLog_1(const char *file, int line, const char *function, const char *fmt, ...);
char *Debug_VirtualKey(KMX_WORD vk);
char *Debug_UnicodeString(PKMX_WCHAR s, int x = 0);
char *Debug_UnicodeString(std::u16string s, int x = 0);
char *Debug_ModifierName(KMX_UINT modifiers);
const char *Debug_VirtualKey(KMX_WORD vk);
const char *Debug_UnicodeString(PKMX_WCHAR s, int x = 0);
const char *Debug_UnicodeString(std::u16string s, int x = 0);
const char *Debug_ModifierName(KMX_UINT modifiers);
//inline KMX_BOOL ShouldDebug();

4
common/engine/keyboardprocessor/src/kmx/kmx_actions.cpp
View file

@ -65,7 +65,7 @@ KMX_BOOL KMX_Actions::CheckOutput(km_kbp_cp *initialContext, km_kbp_cp *expected
std::u16string output(initialContext);
int i = 0, n = 0;
int n = 0;
for (; n < QueueSize; n++)
{
@ -191,7 +191,7 @@ KMX_BOOL KMX_Actions::CheckOutput(km_kbp_cp *initialContext, km_kbp_cp *expected
void KMX_Actions::LogOutput() {
int i = 0, n = 0;
int n = 0;
for (; n < QueueSize; n++)
{

96
common/engine/keyboardprocessor/src/kmx/kmx_consts.cpp
View file

@ -2,36 +2,36 @@
#include <kmx/kmx_processor.h>
const struct char_to_vkey s_char_to_vkey[] = {
{KM_KBP_VKEY_SPACE}, //
{KM_KBP_VKEY_SPACE, 0}, //
{'1', 1}, // !
{KM_KBP_VKEY_QUOTE, 1}, // "
{'3', 1}, // #
{'4', 1}, // $
{'5', 1}, // %
{'7', 1}, // &
{KM_KBP_VKEY_QUOTE}, // '
{KM_KBP_VKEY_QUOTE, 0}, // '
{'9', 1}, // (
{'0', 1}, // )
{'8', 1}, // *
{KM_KBP_VKEY_EQUAL, 1}, // +
{KM_KBP_VKEY_COMMA}, // ,
{KM_KBP_VKEY_HYPHEN}, // -
{KM_KBP_VKEY_PERIOD}, // .
{KM_KBP_VKEY_SLASH}, // /
{'0'},
{'1'},
{'2'},
{'3'},
{'4'},
{'5'},
{'6'},
{'7'},
{'8'},
{'9'},
{KM_KBP_VKEY_COMMA, 0}, // ,
{KM_KBP_VKEY_HYPHEN, 0}, // -
{KM_KBP_VKEY_PERIOD, 0}, // .
{KM_KBP_VKEY_SLASH, 0}, // /
{'0', 0},
{'1', 0},
{'2', 0},
{'3', 0},
{'4', 0},
{'5', 0},
{'6', 0},
{'7', 0},
{'8', 0},
{'9', 0},
{KM_KBP_VKEY_COLON, 1}, // :
{KM_KBP_VKEY_COLON}, // ;
{KM_KBP_VKEY_COLON, 0}, // ;
{KM_KBP_VKEY_COMMA, 1}, // <
{KM_KBP_VKEY_EQUAL}, // =
{KM_KBP_VKEY_EQUAL, 0}, // =
{KM_KBP_VKEY_PERIOD, 1}, // >
{KM_KBP_VKEY_SLASH, 1}, // ?
{'2', 1}, // @
@ -61,38 +61,38 @@ const struct char_to_vkey s_char_to_vkey[] = {
{'X', 1},
{'Y', 1},
{'Z', 1},
{KM_KBP_VKEY_LBRKT},
{KM_KBP_VKEY_BKSLASH},
{KM_KBP_VKEY_RBRKT},
{KM_KBP_VKEY_LBRKT, 0},
{KM_KBP_VKEY_BKSLASH, 0},
{KM_KBP_VKEY_RBRKT, 0},
{'6', 1},
{KM_KBP_VKEY_HYPHEN, 1},
{KM_KBP_VKEY_BKQUOTE},
{'A'},
{'B'},
{'C'},
{'D'},
{'E'},
{'F'},
{'G'},
{'H'},
{'I'},
{'J'},
{'K'},
{'L'},
{'M'},
{'N'},
{'O'},
{'P'},
{'Q'},
{'R'},
{'S'},
{'T'},
{'U'},
{'V'},
{'W'},
{'X'},
{'Y'},
{'Z'},
{KM_KBP_VKEY_BKQUOTE, 0},
{'A', 0},
{'B', 0},
{'C', 0},
{'D', 0},
{'E', 0},
{'F', 0},
{'G', 0},
{'H', 0},
{'I', 0},
{'J', 0},
{'K', 0},
{'L', 0},
{'M', 0},
{'N', 0},
{'O', 0},
{'P', 0},
{'Q', 0},
{'R', 0},
{'S', 0},
{'T', 0},
{'U', 0},
{'V', 0},
{'W', 0},
{'X', 0},
{'Y', 0},
{'Z', 0},
{KM_KBP_VKEY_LBRKT, 1},
{KM_KBP_VKEY_BKSLASH, 1},
{KM_KBP_VKEY_RBRKT, 1},

5
common/engine/keyboardprocessor/src/kmx/kmx_context.cpp
View file

@ -4,11 +4,6 @@
*/
#include <kmx/kmx_processor.h>
const PKMX_CHAR ItemTypes[QIT_MAX+1] = {
"QIT_VKEYDOWN", "QIT_VKEYUP", "QIT_VSHIFTDOWN", "QIT_VSHIFTUP",
"QIT_CHAR", "QIT_DEADKEY", "QIT_BELL", "QIT_BACK", "QIT_CAPSLOCK",
"QIT_INVALIDATECONTEXT" };
/* KMX_Context */
KMX_Context::KMX_Context()

10
common/engine/keyboardprocessor/src/kmx/kmx_debug.cpp
View file

@ -55,7 +55,7 @@ int DebugLog_1(const char *file, int line, const char *function, const char *fmt
if(g_debug_ToConsole) { // I3951
char windowinfo[1024];
sprintf(windowinfo,
"%d" TAB //"TickCount" TAB
"%ld" TAB //"TickCount" TAB
"%s:%d" TAB //"SourceFile" TAB
"%s" TAB //"Function"
"%s" NL, //"Message"
@ -75,7 +75,7 @@ int DebugLog_1(const char *file, int line, const char *function, const char *fmt
return 0;
}
char *Debug_ModifierName(KMX_UINT modifiers) {
const char *Debug_ModifierName(KMX_UINT modifiers) {
#ifdef _MSC_VER
__declspec(thread)
#endif
@ -91,7 +91,7 @@ char *Debug_ModifierName(KMX_UINT modifiers) {
return "Unmodified";
}
char *Debug_VirtualKey(KMX_WORD vk) {
const char *Debug_VirtualKey(KMX_WORD vk) {
#ifdef _MSC_VER
__declspec(thread)
#endif
@ -109,7 +109,7 @@ char *Debug_VirtualKey(KMX_WORD vk) {
return buf;
}
char *Debug_UnicodeString(PKMX_WCHAR s, int x) {
const char *Debug_UnicodeString(PKMX_WCHAR s, int x) {
if (!ShouldDebug()) {
return "";
}
@ -128,7 +128,7 @@ char *Debug_UnicodeString(PKMX_WCHAR s, int x) {
return bufout[x];
}
char *Debug_UnicodeString(std::u16string s, int x) {
const char *Debug_UnicodeString(std::u16string s, int x) {
if (!ShouldDebug()) {
return "";
}

13
common/engine/keyboardprocessor/src/kmx/kmx_file.cpp
View file

@ -8,13 +8,6 @@
#include <share.h>
#endif
/* TODO: use portable 64-bit check here */
#ifdef KMX_64BIT
LPKEYBOARD CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFileSize);
#else
LPKEYBOARD FixupKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFileSize);
#endif
KMX_BOOL KMX_Processor::Load(km_kbp_path_name KeyboardName)
{
if(!LoadKeyboard(KeyboardName, &m_keyboard.Keyboard)) return FALSE; // I5136
@ -83,7 +76,7 @@ unsigned long CalculateBufferCRC(unsigned long count, KMX_BYTE *p)
KMX_BOOL KMX_Processor::LoadKeyboard(km_kbp_path_name fileName, LPKEYBOARD *lpKeyboard)
{
KMX_DWORD sz;
long sz;
PKMX_BYTE buf;
FILE *fp;
LPKEYBOARD kbp;
@ -161,7 +154,7 @@ KMX_BOOL KMX_Processor::LoadKeyboard(km_kbp_path_name fileName, LPKEYBOARD *lpKe
if(!VerifyKeyboard(filebase, sz)) return FALSE;
#ifdef KMX_64BIT
kbp = CopyKeyboard(buf, filebase, sz);
kbp = CopyKeyboard(buf, filebase);
#else
kbp = FixupKeyboard(buf, filebase, sz);
#endif
@ -188,7 +181,7 @@ PKMX_WCHAR KMX_Processor::StringOffset(PKMX_BYTE base, KMX_DWORD offset)
* We know the base is dwFileSize * 3
* After this function finishes, we still need to keep the original data
*/
LPKEYBOARD KMX_Processor::CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFileSize)
LPKEYBOARD KMX_Processor::CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base)
{
PCOMP_KEYBOARD ckbp = (PCOMP_KEYBOARD) base;

4
common/engine/keyboardprocessor/src/kmx/kmx_processor.cpp
View file

@ -13,7 +13,7 @@ KMX_BOOL g_silent = FALSE;
extern KMXTest_KeyboardOption g_keyboardOption[1024];
extern int g_keyboardOptionCount;
KMXTest_KeyboardOption g_keyboardOption[1024] = { 0 };
KMXTest_KeyboardOption g_keyboardOption[1024] = { 0, };
int g_keyboardOptionCount = 0;
/* Environment - to refactor */
@ -63,7 +63,7 @@ KMX_BOOL KMX_Processor::ProcessEvent(KMX_UINT vkey, KMX_DWORD modifiers, KMX_WCH
m_modifiers = modifiers;
m_state.LoopTimes = 0;
if (kbd->StartGroup[BEGIN_UNICODE] == -1) {
if (kbd->StartGroup[BEGIN_UNICODE] == (KMX_DWORD) -1) {
DebugLog("Non-Unicode keyboards are not supported.");
return FALSE;
}

4
common/engine/keyboardprocessor/tests/unit/kmx/kmx.cpp
View file

@ -112,7 +112,7 @@ key_event const vkey_to_event(std::string const & vk_event) {
std::stringstream f(vk_event);
std::string s;
uint16_t modifier_state = 0;
km_kbp_virtual_key vk;
km_kbp_virtual_key vk = 0;
while(std::getline(f, s, ' ')) {
uint16_t modifier = get_modifier(s);
if (modifier != 0) {
@ -120,13 +120,13 @@ key_event const vkey_to_event(std::string const & vk_event) {
}
else {
vk = get_vk(s);
assert(vk != 0);
break;
}
}
// The string should be empty at this point
assert(!std::getline(f, s, ' '));
assert(vk != 0);
return {
vk,