mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-08 01:45:32 +00:00
feat(linux): mcompile-dk remove helpers.cpp/h
This commit is contained in:
Sabine
parent
ed603820ca
commit
da4ea69fde
8 changed files with 13 additions and 3878 deletions
|
|
@ -34,10 +34,10 @@ std::vector<DeadKey*> create_alDead() {
|
|||
v_dw_2D dk_ComposeTable;
|
||||
create_DKTable(dk_ComposeTable);
|
||||
|
||||
for( int i=0; i< (int) dk_ComposeTable.size()-1; i++) {
|
||||
DeadKey *dk2= new DeadKey(dk_ComposeTable[i][0]);
|
||||
for( int i=0; i < (int) dk_ComposeTable.size()-1; i++) {
|
||||
DeadKey *dk2 = new DeadKey(dk_ComposeTable[i][0]);
|
||||
for ( int j=0; j< (int) dk_ComposeTable.size();j++) {
|
||||
if(( dk_ComposeTable[i][0]==dk_ComposeTable[j][0]) && (IsKeymanUsedChar(dk_ComposeTable[j][1])))
|
||||
if(( dk_ComposeTable[i][0] == dk_ComposeTable[j][0]) && (IsKeymanUsedChar(dk_ComposeTable[j][1])))
|
||||
dk2->KMX_AddDeadKeyRow(dk_ComposeTable[j][1],dk_ComposeTable[j][2]);
|
||||
}
|
||||
alDead.push_back(dk2);
|
||||
|
|
@ -46,9 +46,8 @@ std::vector<DeadKey*> create_alDead() {
|
|||
}
|
||||
|
||||
bool found_dk_inVector(KMX_WCHAR dk, std::vector<DeadKey*> &dkVec) {
|
||||
|
||||
int i=0;
|
||||
if( dkVec.size()>0) {
|
||||
if( dkVec.size() > 0) {
|
||||
do {
|
||||
if( dk == dkVec[i]->KMX_GetDeadCharacter())
|
||||
return true;
|
||||
|
|
@ -74,7 +73,6 @@ void refine_alDead(KMX_WCHAR dk, std::vector<DeadKey*> &dkVec, std::vector<DeadK
|
|||
}
|
||||
|
||||
void sort_alDead(std::vector<DeadKey*> &small_Vec, std::vector<DeadKey*> *p_All_Vec) {
|
||||
|
||||
std::vector<DeadKey*> small_sorted;
|
||||
int Vsmall_size;
|
||||
int i = 0;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ void create_DKTable(v_dw_2D & dk_ComposeTable);
|
|||
|
||||
// find all possible dk combinations that exist
|
||||
std::vector<DeadKey*> create_alDead();
|
||||
|
||||
// refine dk to those used in the underlying keyboard
|
||||
void refine_alDead(KMX_WCHAR dk, std::vector<DeadKey*> &myVec, std::vector<DeadKey*> *p_All_Vec);
|
||||
bool found_dk_inVector(KMX_WCHAR dk, std::vector<DeadKey*> &myVec);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,63 +0,0 @@
|
|||
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
//_S2 do not review - all this will be deleted later
|
||||
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
#pragma once
|
||||
#ifndef HELPERS_H
|
||||
#define HELPERS_H
|
||||
|
||||
#include <iostream>
|
||||
#include "mc_savekeyboard.h"
|
||||
#include "mc_kmxfile.h"
|
||||
#include "keymap.h"
|
||||
|
||||
// why again here?
|
||||
typedef std::vector<std::string> v_str_1D;
|
||||
typedef std::vector<KMX_DWORD> v_dw_1D;
|
||||
typedef std::vector<std::vector<KMX_DWORD> > v_dw_2D;
|
||||
typedef std::vector<std::vector<std::vector<KMX_DWORD> > > v_dw_3D;
|
||||
|
||||
int test_helpers();
|
||||
|
||||
// append characters using VectorFile (Data for Other Language on [1][ ][ ] )
|
||||
int append_other_ToVector(v_dw_3D &All_Vector) ;
|
||||
|
||||
// get Keyvals from File and insert into All_Vector
|
||||
bool InsertKeyvalsFromVectorFile(v_dw_3D &complete_Vector) ;
|
||||
|
||||
// create a Vector with all entries of file
|
||||
int createOneVectorFromBothKeyboards(v_dw_3D &All_Vector);
|
||||
|
||||
bool writeVectorToFile(v_dw_3D V) ;
|
||||
bool writeFileToVector(v_dw_3D& complete_Vector, const char* infile);
|
||||
bool CompareVector_To_VectorOfFile(v_dw_3D All_Vector,v_dw_3D File_Vector);
|
||||
bool test_In_Out(v_dw_3D All_Vector);
|
||||
|
||||
// to check if content of Vector is ok
|
||||
bool write_RGKEY_FileToVector(v_dw_2D& shift_states, const char* infile) ;
|
||||
bool CompareVector_To_VectorOfFile_RGKEY(v_dw_2D Win_Vector,v_dw_2D Lin_Vector, v_dw_2D Map_Vector);
|
||||
KMX_DWORD get_position_From_VirtualKey_US(KMX_DWORD VK_US , v_dw_3D &All_Vector);
|
||||
|
||||
int replace_PosKey_with_Keycode(std::string in);
|
||||
|
||||
// query All_Vector
|
||||
// _S2 can go later return the VirtualKey of the US Keyboard for given Scancode
|
||||
KMX_DWORD get_VirtualKey_US_From_SC(KMX_DWORD SC , v_dw_3D &All_Vector);
|
||||
// _S2 can go later return the Scancode of for given VirtualKey of Other Keyboard
|
||||
KMX_DWORD get_SC_From_VirtualKey_Other(KMX_DWORD VK_Other , v_dw_3D &All_Vector);
|
||||
// _S2 can go later return the Scancode of for given VirtualKey of US
|
||||
KMX_DWORD get_SC_From_VirtualKey_US(KMX_DWORD VK_US , v_dw_3D &All_Vector);
|
||||
// _S2 can go later return the Scancode of for given VirtualKey of Other
|
||||
KMX_DWORD get_position_From_VirtualKey_Other(KMX_DWORD VK_US , v_dw_3D &All_Vector);
|
||||
// _S2 can go later return the Scancode of for given VirtualKey of Other in specific column. If column > available columns look in all columns;
|
||||
KMX_DWORD get_position_From_VirtualKey_Other(KMX_DWORD VK_Other , v_dw_3D &All_Vector, int which_columns);
|
||||
/*
|
||||
// returns Keyvals fo ra given key (for unshifted: finds the Name of the Key e.g. A or 1 )
|
||||
std::wstring get_KeyVals_according_to_Shiftstate(GdkKeymap *keymap, guint VK, ShiftState ss, int caps);
|
||||
*/
|
||||
//std::wstring get_VirtualKey_US_from_iKey(KMX_DWORD iKey, ShiftState &ss, int &caps, v_dw_3D &All_Vector);
|
||||
|
||||
//bool KMX_ImportRules_bak(KMX_WCHAR *kbid, LPKMX_KEYBOARD kp,v_dw_3D &All_Vector, GdkKeymap **keymap,std::vector<KMX_DeadkeyMapping> *KMX_FDeadkeys, KMX_BOOL bDeadkeyConversion); // I4353 // I4327
|
||||
//bool KMX_Lin_ImportRules_Lin(KMX_WCHAR *kbid, LPKMX_KEYBOARD kp,v_dw_3D &All_Vector, GdkKeymap **keymap,std::vector<KMX_DeadkeyMapping> *KMX_FDeadkeys, KMX_BOOL bDeadkeyConversion); // I4353 // I4327
|
||||
|
||||
#endif /* HELPERS_H*/
|
||||
|
|
@ -14,15 +14,10 @@
|
|||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "mc_kmxfile.h"
|
||||
#include "kmx_file.h"
|
||||
#include "mc_savekeyboard.h"
|
||||
#include "u16.h"
|
||||
#include "mc_savekeyboard.h"
|
||||
|
||||
typedef std::vector<std::string> v_str_1D;
|
||||
typedef std::vector<KMX_DWORD> v_dw_1D;
|
||||
typedef std::vector<std::vector<KMX_DWORD> > v_dw_2D;
|
||||
typedef std::vector<std::vector<std::vector<KMX_DWORD> > > v_dw_3D;
|
||||
|
||||
enum ShiftState {
|
||||
Base = 0, // 0
|
||||
|
|
@ -64,8 +59,14 @@ const KMX_DWORD KMX_VKMap[] = {
|
|||
0
|
||||
};
|
||||
|
||||
typedef std::vector<std::string> v_str_1D;
|
||||
|
||||
typedef std::vector<KMX_DWORD> v_dw_1D;
|
||||
typedef std::vector<std::vector<KMX_DWORD> > v_dw_2D;
|
||||
typedef std::vector<std::vector<std::vector<KMX_DWORD> > > v_dw_3D;
|
||||
|
||||
static KMX_DWORD returnIfCharInvalid = 0;
|
||||
static KMX_DWORD keycode_max =94;
|
||||
static KMX_DWORD keycode_max = 94;
|
||||
static KMX_DWORD deadkey_min = 0xfe50;
|
||||
static KMX_DWORD deadkey_max = 0xfe93;
|
||||
|
||||
|
|
|
|||
|
|
@ -57,18 +57,6 @@ typedef KMX_BYTE* PKMX_BYTE;
|
|||
typedef KMX_DWORD* PKMX_DWORD;
|
||||
typedef int BOOL;
|
||||
|
||||
//typedef uint8_t* PBYTE;
|
||||
//typedef unsigned short WORD;
|
||||
//typedef wchar_t* LPWSTR;
|
||||
//typedef KMX_CHAR* PKMX_CHAR;
|
||||
//typedef char* LPSTR;
|
||||
//typedef uint8_t* LPBYTE;
|
||||
//typedef KMX_WORD* PKMX_WORD;
|
||||
|
||||
// in WIN:
|
||||
// PVOID A pointer to any type.
|
||||
// typedef PVOID HANDLE;
|
||||
// typedef HANDLE HKL;
|
||||
typedef void* KMX_HKL; // _S2 QUESTION what is the equivalent to HKL and do I need it?? I assume a void*
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#define MCOMPILE_H
|
||||
#include <vector>
|
||||
#include "keymap.h"
|
||||
#include "helpers.h"
|
||||
#include "deadkey.h"
|
||||
#include "mc_kmxfile.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ libxklavier = dependency('libxklavier')
|
|||
deps = [gtk, x11, xkb,libxklavier]
|
||||
|
||||
cpp_files = files(
|
||||
'helpers.cpp',
|
||||
'keymap.cpp',
|
||||
'deadkey.cpp',
|
||||
'mcompile.cpp',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue