erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-28 19:27:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

feat(mac): enable some functions/makros

Browse source
This commit is contained in:
SabinePlay 2024-04-19 09:41:38 +02:00 • committed by Sabine
parent be0c9b441e
commit aae9289966
9 changed files with 42 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mac/.gitignore vendored
View file

@ -17,4 +17,4 @@ setup/textinputsource/textinputsource.x86_64
setup/Install Keyman.app
//Sabine
**/*.exe
**/mcompile/executable/*.*

8
mac/mcompile/deadkey.h
View file

@ -8,7 +8,7 @@
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################
/*
// create a vector for a dk combination ( ` + a -> à )
v_dw_1D createLine(std::string first, std::string second, KMX_DWORD number, std::string nameresult);
@ -28,6 +28,6 @@ bool found_dk_inVector(KMX_WCHAR dk, std::vector<DeadKey*> &myVec);
bool query_dk_combinations_for_specific_dk(v_dw_2D * dk_ComposeTable, v_dw_2D & dk_SingleTable, KMX_DWORD dk);
// get the shifted character of a key and write shiftstate of KVal to shift
KMX_DWORD KMX_changeKeynameToCapital(KMX_DWORD KVal, KMX_DWORD &shift, GdkKeymap* keymap);
*/
# endif //DEADKEY_H
//KMX_DWORD KMX_changeKeynameToCapital(KMX_DWORD KVal, KMX_DWORD &shift, GdkKeymap* keymap);
# endif//DEADKEY_H

17
mac/mcompile/keymap.h
View file

@ -39,7 +39,7 @@ KMX_DWORD get_keyval_From_Keycode(std::vector<int> keyval, int shiftstate,const
#include <iostream>
#include <string>
#include <vector>
*/
enum ShiftState {
Base = 0, // 0
@ -100,7 +100,7 @@ int map_VKShiftState_to_LinModifier(int VKShiftState);
KMX_DWORD convertNamesTo_DWORD_Value(std::string tok_str);
// create a Vector with all entries of both keymaps
int createOneVectorFromBothKeyboards(v_dw_3D &All_Vector,GdkKeymap *keymap);
//int createOneVectorFromBothKeyboards(v_dw_3D &All_Vector,GdkKeymap *keymap);
// read configuration file, split and write to 3D-Vector (Data for US on Vector[0][ ][ ] )
int write_US_ToVector(v_dw_3D &vec, std::string language, const char *text);
@ -118,10 +118,10 @@ int split_US_To_3D_Vector(v_dw_3D &all_US, v_str_1D completeList);
v_dw_2D create_empty_2D_Vector(int dim_rows, int dim_shifts);
// append characters to 3D-Vector using GDK (Data for underlying Language on Vector[1][ ][ ] )
int append_underlying_ToVector(v_dw_3D &All_Vector, GdkKeymap *keymap);
//int append_underlying_ToVector(v_dw_3D &All_Vector, GdkKeymap *keymap);
// initialize GDK
bool InitializeGDK(GdkKeymap **keymap,int argc, gchar *argv[]);
//bool InitializeGDK(GdkKeymap **keymap,int argc, gchar *argv[]);
//------------------------------
@ -530,19 +530,19 @@ bool IsKeymanUsedChar(int KV);
std::u16string convert_DeadkeyValues_To_U16str(int in);
// use gdk_keymap_translate_keyboard_state to get keyval - base function to get keyvals
int KMX_get_KeyVal_From_KeyCode(GdkKeymap *keymap, guint keycode, ShiftState ss, int caps);
//int KMX_get_KeyVal_From_KeyCode(GdkKeymap *keymap, guint keycode, ShiftState ss, int caps);
// use KMX_get_KeyVal_From_KeyCode and prevent use of certain keycodes
KMX_DWORD KMX_get_KeyValUnderlying_From_KeyCodeUnderlying(GdkKeymap *keymap, guint keycode, int shift_state_pos);
//KMX_DWORD KMX_get_KeyValUnderlying_From_KeyCodeUnderlying(GdkKeymap *keymap, guint keycode, int shift_state_pos);
// fill Deadkey with dk and return CATEGORY
KMX_DWORD KMX_get_KeyValUnderlying_From_KeyCodeUnderlying(GdkKeymap *keymap, UINT VKShiftState, UINT KC_underlying, PKMX_WCHAR DeadKey);
//KMX_DWORD KMX_get_KeyValUnderlying_From_KeyCodeUnderlying(GdkKeymap *keymap, UINT VKShiftState, UINT KC_underlying, PKMX_WCHAR DeadKey);
// use Vector to return the Keyval of underlying Keyboard
KMX_WCHAR KMX_get_KeyValUnderlying_From_KeyValUS(v_dw_3D &All_Vector,KMX_DWORD VK_underlying);
// use Vector to return the Keycode of the underlying Keyboard for given VK_US using GDK
KMX_DWORD KMX_get_KeyCodeUnderlying_From_KeyCodeUS(GdkKeymap *keymap, v_dw_3D &All_Vector,KMX_DWORD KC_US, ShiftState ss, int caps);
//KMX_DWORD KMX_get_KeyCodeUnderlying_From_KeyCodeUS(GdkKeymap *keymap, v_dw_3D &All_Vector,KMX_DWORD KC_US, ShiftState ss, int caps);
// return the Keycode of the underlying Keyboard for given VK_US
UINT KMX_get_KeyCodeUnderlying_From_VKUS(KMX_DWORD VirtualKeyUS);
@ -553,7 +553,6 @@ KMX_DWORD KMX_get_VKUS_From_KeyCodeUnderlying(KMX_DWORD keycode);
// convert codePoint to u16string
std::u16string CodePointToU16String(unsigned int codepoint);
# endif// //KEYMAP_H*/

12
mac/mcompile/kmx_file.h
View file

@ -11,7 +11,7 @@
Copyright: Copyright (C) 2003-2018 SIL International.
Authors: mcdurdin
*/
/*
#define UNREFERENCED_PARAMETER(P) (P)
#define TRUNCATE ((size_t)-1)
@ -183,9 +183,9 @@ namespace kmx {
#define U_UC_SENTINEL u"\uFFFF"
//
* VK__MAX defines the highest virtual key code defined in the system = 0xFF. Custom VK codes start at 256
//
/*
VK__MAX defines the highest virtual key code defined in the system = 0xFF. Custom VK codes start at 256
*/
#define VK__MAX 255
#define CODE_ANY 0x01
@ -360,7 +360,7 @@ struct KMX_COMP_KEYBOARD_KMXPLUSINFO {
};
//
* Only valid if comp_keyboard.dwFlags&KF_KMXPLUS
//* Only valid if comp_keyboard.dwFlags&KF_KMXPLUS
//
struct KMX_COMP_KEYBOARD_EX {
KMX_COMP_KEYBOARD header; // 0000 see COMP_KEYBOARD
@ -390,5 +390,5 @@ static_assert(sizeof(KMX_COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOA
} // namespace kmx
} // namespace kbp
} // namespace km
#endif*/
#endif
#endif //KMX_FILE_H

11
mac/mcompile/mc_import_rules.cpp
View file

@ -1,5 +1,4 @@
/*
Name: mc_import_rules
Copyright: Copyright (C) SIL International.
@ -28,10 +27,6 @@
#include "mc_kmxfile.h"
#include "keymap.h"
/*//################################################################################################################################################
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################
const int KMX_ShiftStateMap[] = {
ISVIRTUALKEY,
ISVIRTUALKEY | K_SHIFTFLAG,
@ -68,6 +63,12 @@ bool DeadKey::KMX_ContainsBaseCharacter(KMX_WCHAR baseCharacter) {
return false;
}
/*//################################################################################################################################################
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################
int KMX_ToUnicodeEx(guint keycode, PKMX_WCHAR pwszBuff, int shift_state_pos, int caps,GdkKeymap *keymap) {
GdkKeymapKey *maps;
guint *keyvals;

4
mac/mcompile/mc_import_rules.h
View file

@ -5,7 +5,7 @@
//################################################################################################################################################
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################
/*
class DeadKey {
@ -39,5 +39,5 @@ public:
bool KMX_ContainsBaseCharacter(KMX_WCHAR baseCharacter);
};
*/
# endif //MC_IMPORT_RULES_H

11
mac/mcompile/mc_kmxfile.cpp
View file

@ -11,11 +11,11 @@
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################
/*
KMX_BOOL KMX_VerifyKeyboard(LPKMX_BYTE filebase, KMX_DWORD sz);
LPKMX_KEYBOARD KMX_FixupKeyboard(PKMX_BYTE bufp, PKMX_BYTE base, KMX_DWORD dwFileSize);
/*
KMX_BOOL KMX_SaveKeyboard(LPKMX_KEYBOARD kbd, PKMX_WCHAR filename) {
FILE *fp;
@ -41,7 +41,7 @@ KMX_BOOL KMX_SaveKeyboard(LPKMX_KEYBOARD kbd, PKMX_WCHAR filename) {
}
return TRUE;
}
}*/
KMX_DWORD KMX_WriteCompiledKeyboard(LPKMX_KEYBOARD fk, FILE* hOutfile, KMX_BOOL FSaveDebug) {
@ -227,6 +227,8 @@ PKMX_WCHAR KMX_StringOffset(PKMX_BYTE base, KMX_DWORD offset) {
return (PKMX_WCHAR)(base + offset);
}
/*
#ifdef KMX_64BIT
*/
/** CopyKeyboard will copy the data read into bufp from x86-sized structures into
@ -235,7 +237,6 @@ PKMX_WCHAR KMX_StringOffset(PKMX_BYTE base, KMX_DWORD offset) {
we don't copy the strings
This method is used on 64-bit architectures.
*/
/*
LPKMX_KEYBOARD KMX_CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base) {
PKMX_COMP_KEYBOARD ckbp = (PKMX_COMP_KEYBOARD) base;
@ -311,7 +312,7 @@ LPKMX_KEYBOARD KMX_CopyKeyboard(PKMX_BYTE bufp, PKMX_BYTE base) {
}
return kbp;
}
*/
// else KMX_FixupKeyboard
//#else /* Fixup the keyboard by expanding pointers. On disk the pointers are stored relative to the
// beginning of the file, but we need real pointers. This method is used on 32-bit architectures.

13
mac/mcompile/mc_kmxfile.h
View file

@ -12,13 +12,6 @@
#ifndef _KMXFILE_H
#define _KMXFILE_H
//################################################################################################################################################
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################
/*
typedef struct KMX_tagSTORE {
KMX_DWORD dwSystemID;
@ -84,7 +77,11 @@ KMX_BOOL KMX_LoadKeyboard(char16_t* fileName, LPKMX_KEYBOARD *lpKeyboard);
KMX_BOOL KMX_SaveKeyboard(LPKMX_KEYBOARD kbd, PKMX_WCHAR filename);
KMX_DWORD KMX_WriteCompiledKeyboard(LPKMX_KEYBOARD fk, FILE* hOutfile, KMX_BOOL FSaveDebug);
*/
#endif // _KMXFILE_H
#endif //MC_KMXFILE_H
//################################################################################################################################################
//################################# Code beyond these lines needs to be included in mcompile #####################################################
//################################################################################################################################################

9
mac/mcompile/mcompile.h
View file

@ -3,6 +3,8 @@
#include "keymap.h"
#include <vector>
#include "deadkey.h"
#include "mc_kmxfile.h"
/*
Name: mcompile
@ -29,9 +31,7 @@
//################################################################################################################################################
/*
#include "deadkey.h"
#include "mc_kmxfile.h"
struct KMX_DeadkeyMapping { // I4353
KMX_WCHAR deadkey, dkid;
@ -45,11 +45,10 @@ int run(int argc, std::vector<std::u16string> str_argv, char* argv[]);
PKMX_WCHAR KMX_incxstr(PKMX_WCHAR p);
int KMX_GetDeadkeys(v_dw_2D & dk_Table, KMX_WORD DeadKey, KMX_WORD *OutputPairs, GdkKeymap* keymap);
//int KMX_GetDeadkeys(v_dw_2D & dk_Table, KMX_WORD DeadKey, KMX_WORD *OutputPairs, GdkKeymap* keymap);
void KMX_LogError(const wchar_t* fmt, ...);
#endif*/ /*MCOMPILE_H*/