1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

**********************************************************

Browse Source 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VFS/utf8string.h
+59 -58
View File
@@ -1,37 +1,34 @@
#ifndef _UTF8STRING_H_
#define _UTF8STRING_H_
#include "vfs_config.h"
#include <string>
#include <sstream>
// simple UTF8 wrapper, uses utf8 implementation from http://utfcpp.sourceforge.net/
class utf8string
class VFS_API utf8string
{
friend bool operator<(utf8string const& s1, utf8string const& s2);
friend class StrAccess;
public:
typedef std::wstring str_t;
typedef std::wstring::value_type char_t;
typedef std::wstring::value_type* ptr_t;
typedef std::wstring str_t;
typedef str_t::value_type char_t;
typedef str_t::value_type* ptr_t;
typedef std::wstring::size_type size_t;
typedef str_t::size_type size_t;
////////////////////////////////////////////////////////////////////
static bool less(utf8string const& s1, const utf8string& s2);
static bool equal(utf8string const& s1, const utf8string& s2);
static bool equal(utf8string const& s1, const utf8string::str_t& s2);
static bool equal(utf8string const& s1, const utf8string::char_t* s2);
static bool less(const utf8string::char_t* s1, const utf8string::char_t* s2);
static bool equal(const utf8string::char_t* s1, const utf8string::char_t* s2);
// case sensitive
static bool lessCase(utf8string const& s1, utf8string const& s2);
static bool equalCase(utf8string const& s1, const utf8string& s2);
static bool equalCase(utf8string const& s1, const utf8string::str_t& s2);
static bool equalCase(utf8string const& s1, const utf8string::char_t* s2);
static bool lessCase(const utf8string::char_t* s1, const utf8string::char_t* s2);
static bool equalCase(const utf8string::char_t* s1, const utf8string::char_t* s2);
template<bool (*funName)(utf8string const& s1, utf8string const& s2)>
template<bool (*funName)(const utf8string::char_t* s1, const utf8string::char_t* s2)>
class Op{
public:
bool operator()(utf8string const& s1, utf8string const& s2) const
bool operator()(const utf8string& s1, const utf8string& s2) const
{
return funName(s1,s2);
return funName(s1.c_str(),s2.c_str());
}
};
typedef Op<utf8string::less> Less;
@@ -54,79 +51,83 @@ public:
static std::string as_utf8(utf8string const& str);
static std::string as_utf8(std::wstring const& str);
// if 'strlen' is 0, length is determined automatically
static std::string as_utf8(const wchar_t* str, unsigned int strlength=0);
static std::string as_utf8(const wchar_t* str, utf8string::size_t strlength=0);
//
static std::string narrow(wchar_t const* str, size_t length);
static size_t narrow(wchar_t const* src_str, size_t src_len, char* dst_str, size_t dst_len);
static size_t narrow(std::wstring const& src, std::string& dst);
static std::string narrow(wchar_t const* str, utf8string::size_t length);
static utf8string::size_t narrow(wchar_t const* src_str, utf8string::size_t src_len, char* dst_str, utf8string::size_t dst_len);
static utf8string::size_t narrow(std::wstring const& src, std::string& dst);
//
static std::wstring widen(char const* str, size_t length);
static size_t widen(char const* src_str, size_t src_len, wchar_t* dst_str, size_t dst_len);
static size_t widen(std::string const& src, std::wstring& dst);
static std::wstring widen(char const* str, utf8string::size_t length);
static utf8string::size_t widen(char const* src_str, utf8string::size_t src_len, wchar_t* dst_str, utf8string::size_t dst_len);
static utf8string::size_t widen(std::string const& src, std::wstring& dst);
// convenience method, for the case it should be used in generic code (overloading)
static std::string as_utf8(std::string const& str);
static std::string as_utf8(std::string const& str);
////////////////////////////////////////////////////////////////////
// convert string to UTF8 encoding
inline std::string utf8() const;
inline std::string utf8() const { return as_utf8(_str); }
// returns const reference to copy or compare string
inline std::wstring const& c_wcs() const;
inline std::wstring const& c_wcs() const { return _str; }
inline const wchar_t* c_str() const { return _str.c_str(); }
// returns reference to modify string
std::wstring& r_wcs();
inline std::wstring& r_wcs() { return _str; }
////////////////////////////////////////////////////////////////////
bool empty() const;
inline utf8string::size_t length() const;
utf8string::size_t length() const;
////////////////////////////////////////////////////////////////////
utf8string operator+(utf8string const& str);
utf8string operator+=(utf8string const& str);
private:
std::wstring _str;
str_t _str;
};
bool operator<(utf8string const& s1, utf8string const& s2);
std::wstringstream& operator<<(std::wstringstream& out, utf8string const& str);
std::wstringstream& operator<<(std::wstringstream& out, utf8string::str_t const& str);
std::wstringstream& operator<<(std::wstringstream& out, const utf8string::char_t* str);
VFS_API std::wstringstream& operator<<(std::wstringstream& out, utf8string const& str);
VFS_API std::wstringstream& operator<<(std::wstringstream& out, utf8string::str_t const& str);
VFS_API std::wstringstream& operator<<(std::wstringstream& out, const utf8string::char_t* str);
// explicit compare
namespace StrCmp
{
// case IN-sensitive
bool Equal(const char* s1, const char* s2);
bool Equal(std::string const& s1, std::string const& s2);
bool Equal(std::string const& s1, const char* s2);
bool Equal(const char* s1, std::string const& s2);
VFS_API bool Equal(const char* s1, const char* s2);
VFS_API bool Equal(std::string const& s1, std::string const& s2);
VFS_API bool Equal(std::string const& s1, const char* s2);
VFS_API bool Equal(const char* s1, std::string const& s2);
//
bool Equal(const wchar_t* s1, const wchar_t* s2);
bool Equal(std::wstring const& s1, std::wstring const& s2);
bool Equal(std::wstring const& s1, const wchar_t* s2);
bool Equal(const wchar_t* s1, std::wstring const& s2);
VFS_API bool Equal(const wchar_t* s1, const wchar_t* s2);
VFS_API bool Equal(std::wstring const& s1, std::wstring const& s2);
VFS_API bool Equal(std::wstring const& s1, const wchar_t* s2);
VFS_API bool Equal(const wchar_t* s1, std::wstring const& s2);
//
bool Equal(utf8string const& s1, utf8string const& s2);
bool Equal(utf8string const& s1, std::wstring const& s2);
bool Equal(std::wstring const& s1, utf8string const& s2);
bool Equal(utf8string const& s1, const wchar_t* s2);
bool Equal(const wchar_t* s1, utf8string const& s2);
VFS_API bool Equal(utf8string const& s1, utf8string const& s2);
VFS_API bool Equal(utf8string const& s1, std::wstring const& s2);
VFS_API bool Equal(std::wstring const& s1, utf8string const& s2);
VFS_API bool Equal(utf8string const& s1, const wchar_t* s2);
VFS_API bool Equal(const wchar_t* s1, utf8string const& s2);
// case Sensitive
bool EqualCase(const char* s1, const char* s2);
bool EqualCase(std::string const& s1, std::string const& s2);
bool EqualCase(std::string const& s1, const char* s2);
bool EqualCase(const char* s1, std::string const& s2);
VFS_API bool EqualCase(const char* s1, const char* s2);
VFS_API bool EqualCase(std::string const& s1, std::string const& s2);
VFS_API bool EqualCase(std::string const& s1, const char* s2);
VFS_API bool EqualCase(const char* s1, std::string const& s2);
//
bool EqualCase(const wchar_t* s1, const wchar_t* s2);
bool EqualCase(std::wstring const& s1, std::wstring const& s2);
bool EqualCase(std::wstring const& s1, const wchar_t* s2);
bool EqualCase(const wchar_t* s1, std::wstring const& s2);
VFS_API bool EqualCase(const wchar_t* s1, const wchar_t* s2);
VFS_API bool EqualCase(std::wstring const& s1, std::wstring const& s2);
VFS_API bool EqualCase(std::wstring const& s1, const wchar_t* s2);
VFS_API bool EqualCase(const wchar_t* s1, std::wstring const& s2);
//
bool EqualCase(utf8string const& s1, utf8string const& s2);
bool EqualCase(utf8string const& s1, std::wstring const& s2);
bool EqualCase(std::wstring const& s1, utf8string const& s2);
bool EqualCase(utf8string const& s1, const wchar_t* s2);
bool EqualCase(const wchar_t* s1, utf8string const& s2);
VFS_API bool EqualCase(utf8string const& s1, utf8string const& s2);
VFS_API bool EqualCase(utf8string const& s1, std::wstring const& s2);
VFS_API bool EqualCase(std::wstring const& s1, utf8string const& s2);
VFS_API bool EqualCase(utf8string const& s1, const wchar_t* s2);
VFS_API bool EqualCase(const wchar_t* s1, utf8string const& s2);
}
#endif // _UTF8STRING_H_