2010-08-09 13:28:56 +00:00
|
|
|
#ifndef NALL_UTF8_HPP
|
|
|
|
#define NALL_UTF8_HPP
|
|
|
|
|
|
|
|
//UTF-8 <> UTF-16 conversion
|
|
|
|
//used only for Win32; Linux, etc use UTF-8 internally
|
|
|
|
|
|
|
|
#if defined(_WIN32)
|
|
|
|
|
2010-09-26 05:09:31 +00:00
|
|
|
#undef UNICODE
|
2010-08-09 13:28:56 +00:00
|
|
|
#undef _WIN32_WINNT
|
|
|
|
#undef NOMINMAX
|
2010-09-26 05:09:31 +00:00
|
|
|
#define UNICODE
|
|
|
|
#define _WIN32_WINNT 0x0501
|
2010-08-09 13:28:56 +00:00
|
|
|
#define NOMINMAX
|
2012-06-18 10:13:51 +00:00
|
|
|
#include <winsock2.h>
|
2010-08-09 13:28:56 +00:00
|
|
|
#include <windows.h>
|
|
|
|
#undef interface
|
|
|
|
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
#if !defined(PATH_MAX)
|
|
|
|
#define PATH_MAX 260
|
|
|
|
#endif
|
|
|
|
|
2010-08-09 13:28:56 +00:00
|
|
|
namespace nall {
|
|
|
|
//UTF-8 to UTF-16
|
2013-05-02 11:25:45 +00:00
|
|
|
struct utf16_t {
|
2010-08-09 13:28:56 +00:00
|
|
|
operator wchar_t*() {
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
operator const wchar_t*() const {
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2013-05-02 11:25:45 +00:00
|
|
|
utf16_t(const char* s = "") {
|
2010-08-09 13:28:56 +00:00
|
|
|
if(!s) s = "";
|
2013-03-15 13:11:33 +00:00
|
|
|
unsigned length = MultiByteToWideChar(CP_UTF8, 0, s, -1, nullptr, 0);
|
2010-08-09 13:28:56 +00:00
|
|
|
buffer = new wchar_t[length + 1]();
|
|
|
|
MultiByteToWideChar(CP_UTF8, 0, s, -1, buffer, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
~utf16_t() {
|
|
|
|
delete[] buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2013-05-02 11:25:45 +00:00
|
|
|
wchar_t* buffer;
|
2010-08-09 13:28:56 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//UTF-16 to UTF-8
|
2013-05-02 11:25:45 +00:00
|
|
|
struct utf8_t {
|
2010-08-09 13:28:56 +00:00
|
|
|
operator char*() {
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
operator const char*() const {
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2013-05-02 11:25:45 +00:00
|
|
|
utf8_t(const wchar_t* s = L"") {
|
2010-08-09 13:28:56 +00:00
|
|
|
if(!s) s = L"";
|
2013-03-15 13:11:33 +00:00
|
|
|
unsigned length = WideCharToMultiByte(CP_UTF8, 0, s, -1, nullptr, 0, nullptr, nullptr);
|
2010-08-09 13:28:56 +00:00
|
|
|
buffer = new char[length + 1]();
|
2013-03-15 13:11:33 +00:00
|
|
|
WideCharToMultiByte(CP_UTF8, 0, s, -1, buffer, length, nullptr, nullptr);
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
~utf8_t() {
|
|
|
|
delete[] buffer;
|
|
|
|
}
|
|
|
|
|
2010-09-22 12:49:49 +00:00
|
|
|
utf8_t(const utf8_t&) = delete;
|
|
|
|
utf8_t& operator=(const utf8_t&) = delete;
|
|
|
|
|
2010-08-09 13:28:56 +00:00
|
|
|
private:
|
2013-05-02 11:25:45 +00:00
|
|
|
char* buffer;
|
2010-08-09 13:28:56 +00:00
|
|
|
};
|
2010-09-26 05:09:31 +00:00
|
|
|
|
2013-05-02 11:25:45 +00:00
|
|
|
inline void utf8_args(int& argc, char**& argv) {
|
|
|
|
wchar_t** wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
|
2010-09-26 05:09:31 +00:00
|
|
|
argv = new char*[argc];
|
|
|
|
for(unsigned i = 0; i < argc; i++) {
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
argv[i] = new char[PATH_MAX];
|
2010-09-26 05:09:31 +00:00
|
|
|
strcpy(argv[i], nall::utf8_t(wargv[i]));
|
|
|
|
}
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif //if defined(_WIN32)
|
|
|
|
|
|
|
|
#endif
|