Clean up some space/tab mismatches in DiscIO and InputCommon.
Keeps the files consistent.
This commit is contained in:
lioncash
parent
019b525285
commit
0e3d8e2e9f
|
|
@ -27,19 +27,19 @@
|
|||
namespace DiscIO
|
||||
{
|
||||
CARCFile::CARCFile(const std::string& _rFilename)
|
||||
: m_pBuffer(NULL)
|
||||
, m_Initialized(false)
|
||||
: m_pBuffer(NULL)
|
||||
, m_Initialized(false)
|
||||
{
|
||||
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
|
||||
if (pReader != NULL)
|
||||
{
|
||||
u64 FileSize = pReader->GetDataSize();
|
||||
m_pBuffer = new u8[(u32)FileSize];
|
||||
pReader->Read(0, FileSize, m_pBuffer);
|
||||
delete pReader;
|
||||
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
|
||||
if (pReader != NULL)
|
||||
{
|
||||
u64 FileSize = pReader->GetDataSize();
|
||||
m_pBuffer = new u8[(u32)FileSize];
|
||||
pReader->Read(0, FileSize, m_pBuffer);
|
||||
delete pReader;
|
||||
|
||||
m_Initialized = ParseBuffer();
|
||||
}
|
||||
m_Initialized = ParseBuffer();
|
||||
}
|
||||
}
|
||||
|
||||
CARCFile::CARCFile(const std::string& _rFilename, u32 offset)
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
|
|||
continue;
|
||||
}
|
||||
|
||||
rContent.m_pData = NULL;
|
||||
rContent.m_pData = NULL;
|
||||
char szFilename[1024];
|
||||
|
||||
if (rContent.m_Type & 0x8000) // shared app
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ namespace DiscIO
|
|||
bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize);
|
||||
struct SNANDContent
|
||||
{
|
||||
u32 m_ContentID;
|
||||
u16 m_Index;
|
||||
u16 m_Type;
|
||||
u32 m_Size;
|
||||
u8 m_SHA1Hash[20];
|
||||
u8 m_Header[36]; //all of the above
|
||||
u32 m_ContentID;
|
||||
u16 m_Index;
|
||||
u16 m_Type;
|
||||
u32 m_Size;
|
||||
u8 m_SHA1Hash[20];
|
||||
u8 m_Header[36]; //all of the above
|
||||
|
||||
u8* m_pData;
|
||||
u8* m_pData;
|
||||
};
|
||||
|
||||
// pure virtual interface so just the NANDContentManager can create these files only
|
||||
|
|
@ -47,34 +47,34 @@ class INANDContentLoader
|
|||
{
|
||||
public:
|
||||
|
||||
INANDContentLoader() {}
|
||||
INANDContentLoader() {}
|
||||
|
||||
virtual ~INANDContentLoader() {}
|
||||
virtual ~INANDContentLoader() {}
|
||||
|
||||
virtual bool IsValid() const = 0;
|
||||
virtual bool IsValid() const = 0;
|
||||
virtual void RemoveTitle() const = 0;
|
||||
virtual u64 GetTitleID() const = 0;
|
||||
virtual u16 GetIosVersion() const = 0;
|
||||
virtual u32 GetBootIndex() const = 0;
|
||||
virtual size_t GetContentSize() const = 0;
|
||||
virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;
|
||||
virtual u64 GetTitleID() const = 0;
|
||||
virtual u16 GetIosVersion() const = 0;
|
||||
virtual u32 GetBootIndex() const = 0;
|
||||
virtual size_t GetContentSize() const = 0;
|
||||
virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;
|
||||
virtual const u8* GetTMDView() const = 0;
|
||||
virtual const u8* GetTMDHeader() const = 0;
|
||||
virtual u32 GetTIKSize() const = 0;
|
||||
virtual const u8* GetTIK() const = 0;
|
||||
virtual const std::vector<SNANDContent>& GetContent() const = 0;
|
||||
virtual u16 GetTitleVersion() const = 0;
|
||||
virtual u16 GetNumEntries() const = 0;
|
||||
virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
|
||||
virtual const std::vector<SNANDContent>& GetContent() const = 0;
|
||||
virtual u16 GetTitleVersion() const = 0;
|
||||
virtual u16 GetNumEntries() const = 0;
|
||||
virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
|
||||
virtual u8 GetCountryChar() const = 0;
|
||||
|
||||
enum
|
||||
{
|
||||
TMD_VIEW_SIZE = 0x58,
|
||||
TMD_HEADER_SIZE = 0x1e4,
|
||||
enum
|
||||
{
|
||||
TMD_VIEW_SIZE = 0x58,
|
||||
TMD_HEADER_SIZE = 0x1e4,
|
||||
CONTENT_HEADER_SIZE = 0x24,
|
||||
TICKET_SIZE = 0x2A4
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -83,22 +83,22 @@ class CNANDContentManager
|
|||
{
|
||||
public:
|
||||
|
||||
static CNANDContentManager& Access() { return m_Instance; }
|
||||
static CNANDContentManager& Access() { return m_Instance; }
|
||||
u64 Install_WiiWAD(std::string &fileName);
|
||||
|
||||
const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
|
||||
const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
|
||||
const INANDContentLoader& GetNANDLoader(u64 _titleId, bool forceReload = false);
|
||||
bool RemoveTitle(u64 _titleID);
|
||||
private:
|
||||
|
||||
CNANDContentManager() {};
|
||||
CNANDContentManager() {};
|
||||
|
||||
~CNANDContentManager();
|
||||
~CNANDContentManager();
|
||||
|
||||
static CNANDContentManager m_Instance;
|
||||
static CNANDContentManager m_Instance;
|
||||
|
||||
typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
|
||||
CNANDContentMap m_Map;
|
||||
typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
|
||||
CNANDContentMap m_Map;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public:
|
|||
|
||||
ECountry GetCountry() const;
|
||||
|
||||
u64 GetSize() const;
|
||||
u64 GetSize() const;
|
||||
|
||||
void BuildFST();
|
||||
|
||||
|
|
|
|||
|
|
@ -75,47 +75,47 @@ bool WbfsFileReader::OpenFiles(const char* filename)
|
|||
delete new_entry;
|
||||
return 0 != m_total_files;
|
||||
}
|
||||
|
||||
|
||||
new_entry->base_address = m_size;
|
||||
new_entry->size = new_entry->file.GetSize();
|
||||
m_size += new_entry->size;
|
||||
|
||||
m_total_files ++;
|
||||
m_files.push_back(new_entry);
|
||||
m_files.push_back(new_entry);
|
||||
}
|
||||
}
|
||||
|
||||
bool WbfsFileReader::ReadHeader()
|
||||
{
|
||||
m_files[0]->file.Seek(4, SEEK_SET);
|
||||
|
||||
|
||||
// Read hd size info
|
||||
m_files[0]->file.ReadBytes(&hd_sector_count, 4);
|
||||
hd_sector_count = Common::swap32(hd_sector_count);
|
||||
|
||||
|
||||
m_files[0]->file.ReadBytes(&hd_sector_shift, 1);
|
||||
hd_sector_size = 1 << hd_sector_shift;
|
||||
|
||||
|
||||
if(m_size != hd_sector_count * hd_sector_size)
|
||||
{
|
||||
//printf("File size doesn't match expected size\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Read wbfs cluster info
|
||||
m_files[0]->file.ReadBytes(&wbfs_sector_shift, 1);
|
||||
wbfs_sector_size = 1 << wbfs_sector_shift;
|
||||
wbfs_sector_count = m_size / wbfs_sector_size;
|
||||
|
||||
|
||||
if(wbfs_sector_size < wii_sector_size)
|
||||
{
|
||||
//Setting this too low would case a very large memory allocation
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
m_blocks_per_disc = (wii_sector_count * wii_sector_size) / wbfs_sector_size;
|
||||
m_disc_info_size = align(wii_disc_header_size + m_blocks_per_disc * 2, hd_sector_size);
|
||||
|
||||
|
||||
// Read disc table
|
||||
m_files[0]->file.Seek(2, SEEK_CUR);
|
||||
m_files[0]->file.ReadBytes(disc_table, 500);
|
||||
|
|
@ -125,7 +125,7 @@ bool WbfsFileReader::ReadHeader()
|
|||
//printf("Game must be in 'slot 0'\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
|
|||
nbytes -= read_size;
|
||||
offset += read_size;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -172,16 +172,16 @@ File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
PanicAlert("Read beyond end of disc");
|
||||
m_files[0]->file.Seek(0, SEEK_SET);
|
||||
return m_files[0]->file;
|
||||
}
|
||||
|
||||
WbfsFileReader* WbfsFileReader::Create(const char* filename)
|
||||
{
|
||||
{
|
||||
WbfsFileReader* reader = new WbfsFileReader(filename);
|
||||
|
||||
|
||||
if(reader->IsGood())
|
||||
{
|
||||
return reader;
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class WbfsFileReader : public IBlobReader
|
|||
|
||||
u16* m_wlba_table;
|
||||
u64 m_blocks_per_disc;
|
||||
|
||||
|
||||
bool m_good;
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -45,12 +45,12 @@ private:
|
|||
|
||||
WiiWAD::WiiWAD(const std::string& _rName)
|
||||
{
|
||||
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
|
||||
if (pReader == NULL || File::IsDirectory(_rName))
|
||||
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
|
||||
if (pReader == NULL || File::IsDirectory(_rName))
|
||||
{
|
||||
m_Valid = false;
|
||||
if(pReader) delete pReader;
|
||||
return;
|
||||
if(pReader) delete pReader;
|
||||
return;
|
||||
}
|
||||
|
||||
m_Valid = ParseWAD(*pReader);
|
||||
|
|
@ -71,87 +71,87 @@ WiiWAD::~WiiWAD()
|
|||
|
||||
u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)
|
||||
{
|
||||
if (_Size > 0)
|
||||
{
|
||||
u8* pTmpBuffer = new u8[_Size];
|
||||
_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
|
||||
if (_Size > 0)
|
||||
{
|
||||
u8* pTmpBuffer = new u8[_Size];
|
||||
_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
|
||||
|
||||
if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
|
||||
{
|
||||
if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
|
||||
{
|
||||
ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");
|
||||
PanicAlertT("WiiWAD: Could not read from file");
|
||||
}
|
||||
return pTmpBuffer;
|
||||
}
|
||||
PanicAlertT("WiiWAD: Could not read from file");
|
||||
}
|
||||
return pTmpBuffer;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
|
||||
{
|
||||
CBlobBigEndianReader ReaderBig(_rReader);
|
||||
CBlobBigEndianReader ReaderBig(_rReader);
|
||||
|
||||
// get header size
|
||||
// get header size
|
||||
u32 HeaderSize = ReaderBig.Read32(0);
|
||||
if (HeaderSize != 0x20)
|
||||
{
|
||||
_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
|
||||
return false;
|
||||
}
|
||||
if (HeaderSize != 0x20)
|
||||
{
|
||||
_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
|
||||
return false;
|
||||
}
|
||||
|
||||
// get header
|
||||
u8 Header[0x20];
|
||||
_rReader.Read(0, HeaderSize, Header);
|
||||
// get header
|
||||
u8 Header[0x20];
|
||||
_rReader.Read(0, HeaderSize, Header);
|
||||
u32 HeaderType = ReaderBig.Read32(0x4);
|
||||
if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
|
||||
return false;
|
||||
if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
|
||||
return false;
|
||||
|
||||
m_CertificateChainSize = ReaderBig.Read32(0x8);
|
||||
u32 Reserved = ReaderBig.Read32(0xC);
|
||||
m_TicketSize = ReaderBig.Read32(0x10);
|
||||
m_TMDSize = ReaderBig.Read32(0x14);
|
||||
m_DataAppSize = ReaderBig.Read32(0x18);
|
||||
m_FooterSize = ReaderBig.Read32(0x1C);
|
||||
m_CertificateChainSize = ReaderBig.Read32(0x8);
|
||||
u32 Reserved = ReaderBig.Read32(0xC);
|
||||
m_TicketSize = ReaderBig.Read32(0x10);
|
||||
m_TMDSize = ReaderBig.Read32(0x14);
|
||||
m_DataAppSize = ReaderBig.Read32(0x18);
|
||||
m_FooterSize = ReaderBig.Read32(0x1C);
|
||||
#if MAX_LOGLEVEL >= DEBUG_LEVEL
|
||||
_dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
|
||||
#else
|
||||
(void)Reserved;
|
||||
#endif
|
||||
|
||||
u32 Offset = 0x40;
|
||||
m_pCertificateChain = CreateWADEntry(_rReader, m_CertificateChainSize, Offset); Offset += ROUND_UP(m_CertificateChainSize, 0x40);
|
||||
m_pTicket = CreateWADEntry(_rReader, m_TicketSize, Offset); Offset += ROUND_UP(m_TicketSize, 0x40);
|
||||
m_pTMD = CreateWADEntry(_rReader, m_TMDSize, Offset); Offset += ROUND_UP(m_TMDSize, 0x40);
|
||||
m_pDataApp = CreateWADEntry(_rReader, m_DataAppSize, Offset); Offset += ROUND_UP(m_DataAppSize, 0x40);
|
||||
m_pFooter = CreateWADEntry(_rReader, m_FooterSize, Offset); Offset += ROUND_UP(m_FooterSize, 0x40);
|
||||
u32 Offset = 0x40;
|
||||
m_pCertificateChain = CreateWADEntry(_rReader, m_CertificateChainSize, Offset); Offset += ROUND_UP(m_CertificateChainSize, 0x40);
|
||||
m_pTicket = CreateWADEntry(_rReader, m_TicketSize, Offset); Offset += ROUND_UP(m_TicketSize, 0x40);
|
||||
m_pTMD = CreateWADEntry(_rReader, m_TMDSize, Offset); Offset += ROUND_UP(m_TMDSize, 0x40);
|
||||
m_pDataApp = CreateWADEntry(_rReader, m_DataAppSize, Offset); Offset += ROUND_UP(m_DataAppSize, 0x40);
|
||||
m_pFooter = CreateWADEntry(_rReader, m_FooterSize, Offset); Offset += ROUND_UP(m_FooterSize, 0x40);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool WiiWAD::IsWiiWAD(const std::string& _rName)
|
||||
{
|
||||
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
|
||||
if (pReader == NULL)
|
||||
return false;
|
||||
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
|
||||
if (pReader == NULL)
|
||||
return false;
|
||||
|
||||
CBlobBigEndianReader Reader(*pReader);
|
||||
bool Result = false;
|
||||
CBlobBigEndianReader Reader(*pReader);
|
||||
bool Result = false;
|
||||
|
||||
// check for wii wad
|
||||
if (Reader.Read32(0x00) == 0x20)
|
||||
{
|
||||
u32 WADTYpe = Reader.Read32(0x04);
|
||||
switch(WADTYpe)
|
||||
{
|
||||
case 0x49730000:
|
||||
case 0x69620000:
|
||||
Result = true;
|
||||
}
|
||||
}
|
||||
// check for wii wad
|
||||
if (Reader.Read32(0x00) == 0x20)
|
||||
{
|
||||
u32 WADTYpe = Reader.Read32(0x04);
|
||||
switch(WADTYpe)
|
||||
{
|
||||
case 0x49730000:
|
||||
case 0x69620000:
|
||||
Result = true;
|
||||
}
|
||||
}
|
||||
|
||||
delete pReader;
|
||||
delete pReader;
|
||||
|
||||
return Result;
|
||||
return Result;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class WiiWAD
|
|||
{
|
||||
public:
|
||||
|
||||
WiiWAD(const std::string& _rName);
|
||||
WiiWAD(const std::string& _rName);
|
||||
|
||||
~WiiWAD();
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ public:
|
|||
u8* GetDataApp() const { return m_pDataApp; }
|
||||
u8* GetFooter() const { return m_pFooter; }
|
||||
|
||||
static bool IsWiiWAD(const std::string& _rName);
|
||||
static bool IsWiiWAD(const std::string& _rName);
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
|||
|
|
@ -25,92 +25,92 @@ namespace InputCommon
|
|||
// Taken from wxw source code
|
||||
KeySym wxCharCodeWXToX(int id)
|
||||
{
|
||||
KeySym keySym;
|
||||
KeySym keySym;
|
||||
|
||||
switch (id)
|
||||
{
|
||||
case WXK_CANCEL: keySym = XK_Cancel; break;
|
||||
case WXK_BACK: keySym = XK_BackSpace; break;
|
||||
case WXK_TAB: keySym = XK_Tab; break;
|
||||
case WXK_CLEAR: keySym = XK_Clear; break;
|
||||
case WXK_RETURN: keySym = XK_Return; break;
|
||||
case WXK_SHIFT: keySym = XK_Shift_L; break;
|
||||
case WXK_CONTROL: keySym = XK_Control_L; break;
|
||||
case WXK_ALT: keySym = XK_Meta_L; break;
|
||||
case WXK_CAPITAL: keySym = XK_Caps_Lock; break;
|
||||
case WXK_MENU : keySym = XK_Menu; break;
|
||||
case WXK_PAUSE: keySym = XK_Pause; break;
|
||||
case WXK_ESCAPE: keySym = XK_Escape; break;
|
||||
case WXK_SPACE: keySym = ' '; break;
|
||||
case WXK_PAGEUP: keySym = XK_Prior; break;
|
||||
case WXK_PAGEDOWN: keySym = XK_Next; break;
|
||||
case WXK_END: keySym = XK_End; break;
|
||||
case WXK_HOME : keySym = XK_Home; break;
|
||||
case WXK_LEFT : keySym = XK_Left; break;
|
||||
case WXK_UP: keySym = XK_Up; break;
|
||||
case WXK_RIGHT: keySym = XK_Right; break;
|
||||
case WXK_DOWN : keySym = XK_Down; break;
|
||||
case WXK_SELECT: keySym = XK_Select; break;
|
||||
case WXK_PRINT: keySym = XK_Print; break;
|
||||
case WXK_EXECUTE: keySym = XK_Execute; break;
|
||||
case WXK_INSERT: keySym = XK_Insert; break;
|
||||
case WXK_DELETE: keySym = XK_Delete; break;
|
||||
case WXK_HELP : keySym = XK_Help; break;
|
||||
case WXK_NUMPAD0: keySym = XK_KP_0; break; case WXK_NUMPAD_INSERT: keySym = XK_KP_Insert; break;
|
||||
case WXK_NUMPAD1: keySym = XK_KP_1; break; case WXK_NUMPAD_END: keySym = XK_KP_End; break;
|
||||
case WXK_NUMPAD2: keySym = XK_KP_2; break; case WXK_NUMPAD_DOWN: keySym = XK_KP_Down; break;
|
||||
case WXK_NUMPAD3: keySym = XK_KP_3; break; case WXK_NUMPAD_PAGEDOWN: keySym = XK_KP_Page_Down; break;
|
||||
case WXK_NUMPAD4: keySym = XK_KP_4; break; case WXK_NUMPAD_LEFT: keySym = XK_KP_Left; break;
|
||||
case WXK_NUMPAD5: keySym = XK_KP_5; break;
|
||||
case WXK_NUMPAD6: keySym = XK_KP_6; break; case WXK_NUMPAD_RIGHT: keySym = XK_KP_Right; break;
|
||||
case WXK_NUMPAD7: keySym = XK_KP_7; break; case WXK_NUMPAD_HOME: keySym = XK_KP_Home; break;
|
||||
case WXK_NUMPAD8: keySym = XK_KP_8; break; case WXK_NUMPAD_UP: keySym = XK_KP_Up; break;
|
||||
case WXK_NUMPAD9: keySym = XK_KP_9; break; case WXK_NUMPAD_PAGEUP: keySym = XK_KP_Page_Up; break;
|
||||
case WXK_NUMPAD_DECIMAL: keySym = XK_KP_Decimal; break; case WXK_NUMPAD_DELETE: keySym = XK_KP_Delete; break;
|
||||
case WXK_NUMPAD_MULTIPLY: keySym = XK_KP_Multiply; break;
|
||||
case WXK_NUMPAD_ADD: keySym = XK_KP_Add; break;
|
||||
case WXK_NUMPAD_SUBTRACT: keySym = XK_KP_Subtract; break;
|
||||
case WXK_NUMPAD_DIVIDE: keySym = XK_KP_Divide; break;
|
||||
case WXK_NUMPAD_ENTER: keySym = XK_KP_Enter; break;
|
||||
case WXK_NUMPAD_SEPARATOR: keySym = XK_KP_Separator; break;
|
||||
case WXK_F1: keySym = XK_F1; break;
|
||||
case WXK_F2: keySym = XK_F2; break;
|
||||
case WXK_F3: keySym = XK_F3; break;
|
||||
case WXK_F4: keySym = XK_F4; break;
|
||||
case WXK_F5: keySym = XK_F5; break;
|
||||
case WXK_F6: keySym = XK_F6; break;
|
||||
case WXK_F7: keySym = XK_F7; break;
|
||||
case WXK_F8: keySym = XK_F8; break;
|
||||
case WXK_F9: keySym = XK_F9; break;
|
||||
case WXK_F10: keySym = XK_F10; break;
|
||||
case WXK_F11: keySym = XK_F11; break;
|
||||
case WXK_F12: keySym = XK_F12; break;
|
||||
case WXK_F13: keySym = XK_F13; break;
|
||||
case WXK_F14: keySym = XK_F14; break;
|
||||
case WXK_F15: keySym = XK_F15; break;
|
||||
case WXK_F16: keySym = XK_F16; break;
|
||||
case WXK_F17: keySym = XK_F17; break;
|
||||
case WXK_F18: keySym = XK_F18; break;
|
||||
case WXK_F19: keySym = XK_F19; break;
|
||||
case WXK_F20: keySym = XK_F20; break;
|
||||
case WXK_F21: keySym = XK_F21; break;
|
||||
case WXK_F22: keySym = XK_F22; break;
|
||||
case WXK_F23: keySym = XK_F23; break;
|
||||
case WXK_F24: keySym = XK_F24; break;
|
||||
case WXK_NUMLOCK: keySym = XK_Num_Lock; break;
|
||||
case WXK_SCROLL: keySym = XK_Scroll_Lock; break;
|
||||
switch (id)
|
||||
{
|
||||
case WXK_CANCEL: keySym = XK_Cancel; break;
|
||||
case WXK_BACK: keySym = XK_BackSpace; break;
|
||||
case WXK_TAB: keySym = XK_Tab; break;
|
||||
case WXK_CLEAR: keySym = XK_Clear; break;
|
||||
case WXK_RETURN: keySym = XK_Return; break;
|
||||
case WXK_SHIFT: keySym = XK_Shift_L; break;
|
||||
case WXK_CONTROL: keySym = XK_Control_L; break;
|
||||
case WXK_ALT: keySym = XK_Meta_L; break;
|
||||
case WXK_CAPITAL: keySym = XK_Caps_Lock; break;
|
||||
case WXK_MENU : keySym = XK_Menu; break;
|
||||
case WXK_PAUSE: keySym = XK_Pause; break;
|
||||
case WXK_ESCAPE: keySym = XK_Escape; break;
|
||||
case WXK_SPACE: keySym = ' '; break;
|
||||
case WXK_PAGEUP: keySym = XK_Prior; break;
|
||||
case WXK_PAGEDOWN: keySym = XK_Next; break;
|
||||
case WXK_END: keySym = XK_End; break;
|
||||
case WXK_HOME : keySym = XK_Home; break;
|
||||
case WXK_LEFT : keySym = XK_Left; break;
|
||||
case WXK_UP: keySym = XK_Up; break;
|
||||
case WXK_RIGHT: keySym = XK_Right; break;
|
||||
case WXK_DOWN : keySym = XK_Down; break;
|
||||
case WXK_SELECT: keySym = XK_Select; break;
|
||||
case WXK_PRINT: keySym = XK_Print; break;
|
||||
case WXK_EXECUTE: keySym = XK_Execute; break;
|
||||
case WXK_INSERT: keySym = XK_Insert; break;
|
||||
case WXK_DELETE: keySym = XK_Delete; break;
|
||||
case WXK_HELP : keySym = XK_Help; break;
|
||||
case WXK_NUMPAD0: keySym = XK_KP_0; break; case WXK_NUMPAD_INSERT: keySym = XK_KP_Insert; break;
|
||||
case WXK_NUMPAD1: keySym = XK_KP_1; break; case WXK_NUMPAD_END: keySym = XK_KP_End; break;
|
||||
case WXK_NUMPAD2: keySym = XK_KP_2; break; case WXK_NUMPAD_DOWN: keySym = XK_KP_Down; break;
|
||||
case WXK_NUMPAD3: keySym = XK_KP_3; break; case WXK_NUMPAD_PAGEDOWN: keySym = XK_KP_Page_Down; break;
|
||||
case WXK_NUMPAD4: keySym = XK_KP_4; break; case WXK_NUMPAD_LEFT: keySym = XK_KP_Left; break;
|
||||
case WXK_NUMPAD5: keySym = XK_KP_5; break;
|
||||
case WXK_NUMPAD6: keySym = XK_KP_6; break; case WXK_NUMPAD_RIGHT: keySym = XK_KP_Right; break;
|
||||
case WXK_NUMPAD7: keySym = XK_KP_7; break; case WXK_NUMPAD_HOME: keySym = XK_KP_Home; break;
|
||||
case WXK_NUMPAD8: keySym = XK_KP_8; break; case WXK_NUMPAD_UP: keySym = XK_KP_Up; break;
|
||||
case WXK_NUMPAD9: keySym = XK_KP_9; break; case WXK_NUMPAD_PAGEUP: keySym = XK_KP_Page_Up; break;
|
||||
case WXK_NUMPAD_DECIMAL: keySym = XK_KP_Decimal; break; case WXK_NUMPAD_DELETE: keySym = XK_KP_Delete; break;
|
||||
case WXK_NUMPAD_MULTIPLY: keySym = XK_KP_Multiply; break;
|
||||
case WXK_NUMPAD_ADD: keySym = XK_KP_Add; break;
|
||||
case WXK_NUMPAD_SUBTRACT: keySym = XK_KP_Subtract; break;
|
||||
case WXK_NUMPAD_DIVIDE: keySym = XK_KP_Divide; break;
|
||||
case WXK_NUMPAD_ENTER: keySym = XK_KP_Enter; break;
|
||||
case WXK_NUMPAD_SEPARATOR: keySym = XK_KP_Separator; break;
|
||||
case WXK_F1: keySym = XK_F1; break;
|
||||
case WXK_F2: keySym = XK_F2; break;
|
||||
case WXK_F3: keySym = XK_F3; break;
|
||||
case WXK_F4: keySym = XK_F4; break;
|
||||
case WXK_F5: keySym = XK_F5; break;
|
||||
case WXK_F6: keySym = XK_F6; break;
|
||||
case WXK_F7: keySym = XK_F7; break;
|
||||
case WXK_F8: keySym = XK_F8; break;
|
||||
case WXK_F9: keySym = XK_F9; break;
|
||||
case WXK_F10: keySym = XK_F10; break;
|
||||
case WXK_F11: keySym = XK_F11; break;
|
||||
case WXK_F12: keySym = XK_F12; break;
|
||||
case WXK_F13: keySym = XK_F13; break;
|
||||
case WXK_F14: keySym = XK_F14; break;
|
||||
case WXK_F15: keySym = XK_F15; break;
|
||||
case WXK_F16: keySym = XK_F16; break;
|
||||
case WXK_F17: keySym = XK_F17; break;
|
||||
case WXK_F18: keySym = XK_F18; break;
|
||||
case WXK_F19: keySym = XK_F19; break;
|
||||
case WXK_F20: keySym = XK_F20; break;
|
||||
case WXK_F21: keySym = XK_F21; break;
|
||||
case WXK_F22: keySym = XK_F22; break;
|
||||
case WXK_F23: keySym = XK_F23; break;
|
||||
case WXK_F24: keySym = XK_F24; break;
|
||||
case WXK_NUMLOCK: keySym = XK_Num_Lock; break;
|
||||
case WXK_SCROLL: keySym = XK_Scroll_Lock; break;
|
||||
// Input fix: Config dialogs read all alphabetic characters as UPPERCASE and
|
||||
// saves the UPPERCASE keycodes. X11 reads these as lowercase by default.
|
||||
default:
|
||||
if (id >= 65 && id <= 90)
|
||||
// Standard uppercase letter: return lowercase keycode
|
||||
keySym = (KeySym)id + 32;
|
||||
else
|
||||
// All other keyboard characters
|
||||
keySym = id <= 255 ? (KeySym)id : 0;
|
||||
}
|
||||
if (id >= 65 && id <= 90)
|
||||
// Standard uppercase letter: return lowercase keycode
|
||||
keySym = (KeySym)id + 32;
|
||||
else
|
||||
// All other keyboard characters
|
||||
keySym = id <= 255 ? (KeySym)id : 0;
|
||||
}
|
||||
|
||||
return keySym;
|
||||
return keySym;
|
||||
}
|
||||
int wxKeyModWXToX(int modstate)
|
||||
{
|
||||
|
|
@ -125,178 +125,178 @@ int wxKeyModWXToX(int modstate)
|
|||
}
|
||||
#endif
|
||||
void XKeyToString(unsigned int keycode, char *keyStr) {
|
||||
switch (keycode) {
|
||||
|
||||
case XK_Insert:
|
||||
sprintf(keyStr, "INSERT");
|
||||
break;
|
||||
case XK_Delete:
|
||||
sprintf(keyStr, "DELETE");
|
||||
break;
|
||||
case XK_Home:
|
||||
sprintf(keyStr, "HOME");
|
||||
break;
|
||||
case XK_End:
|
||||
sprintf(keyStr, "END");
|
||||
break;
|
||||
case XK_Prior:
|
||||
sprintf(keyStr, "PAGEUP");
|
||||
break;
|
||||
case XK_Next:
|
||||
sprintf(keyStr, "PAGEDOWN");
|
||||
break;
|
||||
case XK_Left:
|
||||
sprintf(keyStr, "LEFT");
|
||||
break;
|
||||
case XK_Up:
|
||||
sprintf(keyStr, "UP");
|
||||
break;
|
||||
case XK_Right:
|
||||
sprintf(keyStr, "RIGHT");
|
||||
break;
|
||||
case XK_Down:
|
||||
sprintf(keyStr, "DOWN");
|
||||
break;
|
||||
case XK_Return:
|
||||
sprintf(keyStr, "RETURN");
|
||||
break;
|
||||
case XK_Escape:
|
||||
sprintf(keyStr, "ESCAPE");
|
||||
break;
|
||||
case XK_Caps_Lock:
|
||||
sprintf(keyStr, "CAPSLOCK");
|
||||
break;
|
||||
case XK_BackSpace:
|
||||
sprintf(keyStr, "BACKSPACE");
|
||||
break;
|
||||
case XK_Tab:
|
||||
sprintf(keyStr, "TAB");
|
||||
break;
|
||||
case XK_KP_Enter:
|
||||
sprintf(keyStr, "KP ENTER");
|
||||
break;
|
||||
case XK_KP_Left:
|
||||
sprintf(keyStr, "KP LEFT");
|
||||
break;
|
||||
case XK_KP_Up:
|
||||
sprintf(keyStr, "KP UP");
|
||||
break;
|
||||
case XK_KP_Right:
|
||||
sprintf(keyStr, "KP RIGHT");
|
||||
break;
|
||||
case XK_KP_Down:
|
||||
sprintf(keyStr, "KP DOWN");
|
||||
break;
|
||||
case XK_KP_Insert:
|
||||
sprintf(keyStr, "KP Insert");
|
||||
break;
|
||||
case XK_KP_Delete:
|
||||
sprintf(keyStr, "KP Delete");
|
||||
break;
|
||||
case XK_KP_Page_Down:
|
||||
sprintf(keyStr, "KP Page Down");
|
||||
break;
|
||||
case XK_KP_Page_Up:
|
||||
sprintf(keyStr, "KP Page Up");
|
||||
break;
|
||||
case XK_KP_Separator:
|
||||
sprintf(keyStr, "KP Separator");
|
||||
break;
|
||||
case XK_KP_Home:
|
||||
sprintf(keyStr, "KP Home");
|
||||
break;
|
||||
case XK_KP_End:
|
||||
sprintf(keyStr, "KP End");
|
||||
break;
|
||||
case XK_KP_Subtract:
|
||||
sprintf(keyStr, "KP -");
|
||||
break;
|
||||
case XK_KP_Add:
|
||||
sprintf(keyStr, "KP +");
|
||||
break;
|
||||
case XK_KP_Multiply:
|
||||
sprintf(keyStr, "KP *");
|
||||
break;
|
||||
case XK_KP_Divide:
|
||||
sprintf(keyStr, "KP /");
|
||||
break;
|
||||
case XK_KP_Decimal:
|
||||
sprintf(keyStr, "KP .");
|
||||
break;
|
||||
case XK_KP_0:
|
||||
sprintf(keyStr, "KP 0");
|
||||
break;
|
||||
case XK_KP_1:
|
||||
sprintf(keyStr, "KP 1");
|
||||
break;
|
||||
case XK_KP_2:
|
||||
sprintf(keyStr, "KP 2");
|
||||
break;
|
||||
case XK_KP_3:
|
||||
sprintf(keyStr, "KP 3");
|
||||
break;
|
||||
case XK_KP_4:
|
||||
sprintf(keyStr, "KP 4");
|
||||
break;
|
||||
case XK_KP_5:
|
||||
sprintf(keyStr, "KP 5");
|
||||
break;
|
||||
case XK_KP_6:
|
||||
sprintf(keyStr, "KP 6");
|
||||
break;
|
||||
case XK_KP_7:
|
||||
sprintf(keyStr, "KP 7");
|
||||
break;
|
||||
case XK_KP_8:
|
||||
sprintf(keyStr, "KP 8");
|
||||
break;
|
||||
case XK_KP_9:
|
||||
sprintf(keyStr, "KP 9");
|
||||
break;
|
||||
case XK_Shift_L:
|
||||
sprintf(keyStr, "LShift");
|
||||
break;
|
||||
case XK_Control_L:
|
||||
sprintf(keyStr, "LControl");
|
||||
break;
|
||||
case XK_F1:
|
||||
sprintf(keyStr, "F1");
|
||||
break;
|
||||
case XK_F2:
|
||||
sprintf(keyStr, "F2");
|
||||
break;
|
||||
case XK_F3:
|
||||
sprintf(keyStr, "F3");
|
||||
break;
|
||||
case XK_F4:
|
||||
sprintf(keyStr, "F4");
|
||||
break;
|
||||
case XK_F5:
|
||||
sprintf(keyStr, "F5");
|
||||
break;
|
||||
case XK_F6:
|
||||
sprintf(keyStr, "F6");
|
||||
break;
|
||||
case XK_F7:
|
||||
sprintf(keyStr, "F7");
|
||||
break;
|
||||
case XK_F8:
|
||||
sprintf(keyStr, "F8");
|
||||
break;
|
||||
case XK_F9:
|
||||
sprintf(keyStr, "F9");
|
||||
break;
|
||||
case XK_F10:
|
||||
sprintf(keyStr, "F10");
|
||||
break;
|
||||
case XK_F11:
|
||||
sprintf(keyStr, "F11");
|
||||
break;
|
||||
case XK_F12:
|
||||
sprintf(keyStr, "F12");
|
||||
break;
|
||||
default:
|
||||
sprintf(keyStr, "%c", toupper(keycode));
|
||||
}
|
||||
switch (keycode)
|
||||
{
|
||||
case XK_Insert:
|
||||
sprintf(keyStr, "INSERT");
|
||||
break;
|
||||
case XK_Delete:
|
||||
sprintf(keyStr, "DELETE");
|
||||
break;
|
||||
case XK_Home:
|
||||
sprintf(keyStr, "HOME");
|
||||
break;
|
||||
case XK_End:
|
||||
sprintf(keyStr, "END");
|
||||
break;
|
||||
case XK_Prior:
|
||||
sprintf(keyStr, "PAGEUP");
|
||||
break;
|
||||
case XK_Next:
|
||||
sprintf(keyStr, "PAGEDOWN");
|
||||
break;
|
||||
case XK_Left:
|
||||
sprintf(keyStr, "LEFT");
|
||||
break;
|
||||
case XK_Up:
|
||||
sprintf(keyStr, "UP");
|
||||
break;
|
||||
case XK_Right:
|
||||
sprintf(keyStr, "RIGHT");
|
||||
break;
|
||||
case XK_Down:
|
||||
sprintf(keyStr, "DOWN");
|
||||
break;
|
||||
case XK_Return:
|
||||
sprintf(keyStr, "RETURN");
|
||||
break;
|
||||
case XK_Escape:
|
||||
sprintf(keyStr, "ESCAPE");
|
||||
break;
|
||||
case XK_Caps_Lock:
|
||||
sprintf(keyStr, "CAPSLOCK");
|
||||
break;
|
||||
case XK_BackSpace:
|
||||
sprintf(keyStr, "BACKSPACE");
|
||||
break;
|
||||
case XK_Tab:
|
||||
sprintf(keyStr, "TAB");
|
||||
break;
|
||||
case XK_KP_Enter:
|
||||
sprintf(keyStr, "KP ENTER");
|
||||
break;
|
||||
case XK_KP_Left:
|
||||
sprintf(keyStr, "KP LEFT");
|
||||
break;
|
||||
case XK_KP_Up:
|
||||
sprintf(keyStr, "KP UP");
|
||||
break;
|
||||
case XK_KP_Right:
|
||||
sprintf(keyStr, "KP RIGHT");
|
||||
break;
|
||||
case XK_KP_Down:
|
||||
sprintf(keyStr, "KP DOWN");
|
||||
break;
|
||||
case XK_KP_Insert:
|
||||
sprintf(keyStr, "KP Insert");
|
||||
break;
|
||||
case XK_KP_Delete:
|
||||
sprintf(keyStr, "KP Delete");
|
||||
break;
|
||||
case XK_KP_Page_Down:
|
||||
sprintf(keyStr, "KP Page Down");
|
||||
break;
|
||||
case XK_KP_Page_Up:
|
||||
sprintf(keyStr, "KP Page Up");
|
||||
break;
|
||||
case XK_KP_Separator:
|
||||
sprintf(keyStr, "KP Separator");
|
||||
break;
|
||||
case XK_KP_Home:
|
||||
sprintf(keyStr, "KP Home");
|
||||
break;
|
||||
case XK_KP_End:
|
||||
sprintf(keyStr, "KP End");
|
||||
break;
|
||||
case XK_KP_Subtract:
|
||||
sprintf(keyStr, "KP -");
|
||||
break;
|
||||
case XK_KP_Add:
|
||||
sprintf(keyStr, "KP +");
|
||||
break;
|
||||
case XK_KP_Multiply:
|
||||
sprintf(keyStr, "KP *");
|
||||
break;
|
||||
case XK_KP_Divide:
|
||||
sprintf(keyStr, "KP /");
|
||||
break;
|
||||
case XK_KP_Decimal:
|
||||
sprintf(keyStr, "KP .");
|
||||
break;
|
||||
case XK_KP_0:
|
||||
sprintf(keyStr, "KP 0");
|
||||
break;
|
||||
case XK_KP_1:
|
||||
sprintf(keyStr, "KP 1");
|
||||
break;
|
||||
case XK_KP_2:
|
||||
sprintf(keyStr, "KP 2");
|
||||
break;
|
||||
case XK_KP_3:
|
||||
sprintf(keyStr, "KP 3");
|
||||
break;
|
||||
case XK_KP_4:
|
||||
sprintf(keyStr, "KP 4");
|
||||
break;
|
||||
case XK_KP_5:
|
||||
sprintf(keyStr, "KP 5");
|
||||
break;
|
||||
case XK_KP_6:
|
||||
sprintf(keyStr, "KP 6");
|
||||
break;
|
||||
case XK_KP_7:
|
||||
sprintf(keyStr, "KP 7");
|
||||
break;
|
||||
case XK_KP_8:
|
||||
sprintf(keyStr, "KP 8");
|
||||
break;
|
||||
case XK_KP_9:
|
||||
sprintf(keyStr, "KP 9");
|
||||
break;
|
||||
case XK_Shift_L:
|
||||
sprintf(keyStr, "LShift");
|
||||
break;
|
||||
case XK_Control_L:
|
||||
sprintf(keyStr, "LControl");
|
||||
break;
|
||||
case XK_F1:
|
||||
sprintf(keyStr, "F1");
|
||||
break;
|
||||
case XK_F2:
|
||||
sprintf(keyStr, "F2");
|
||||
break;
|
||||
case XK_F3:
|
||||
sprintf(keyStr, "F3");
|
||||
break;
|
||||
case XK_F4:
|
||||
sprintf(keyStr, "F4");
|
||||
break;
|
||||
case XK_F5:
|
||||
sprintf(keyStr, "F5");
|
||||
break;
|
||||
case XK_F6:
|
||||
sprintf(keyStr, "F6");
|
||||
break;
|
||||
case XK_F7:
|
||||
sprintf(keyStr, "F7");
|
||||
break;
|
||||
case XK_F8:
|
||||
sprintf(keyStr, "F8");
|
||||
break;
|
||||
case XK_F9:
|
||||
sprintf(keyStr, "F9");
|
||||
break;
|
||||
case XK_F10:
|
||||
sprintf(keyStr, "F10");
|
||||
break;
|
||||
case XK_F11:
|
||||
sprintf(keyStr, "F11");
|
||||
break;
|
||||
case XK_F12:
|
||||
sprintf(keyStr, "F12");
|
||||
break;
|
||||
default:
|
||||
sprintf(keyStr, "%c", toupper(keycode));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue