mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-19 13:29:54 +00:00
meow
This commit is contained in:
DepressedTWM
parent
6dd367d8bf
commit
4b13fed3e1
3 changed files with 47 additions and 51 deletions
|
|
@ -68,9 +68,6 @@ static void parseExtensionsCompat(_PFNGLGETSTRINGPROC GetString, BoostSet<std::s
|
|||
#define GL_FUN(name, type) \
|
||||
gl.name = (type) SDL_GL_GetProcAddress("gl" #name EXT_SUFFIX);
|
||||
|
||||
#define EXC(msg) \
|
||||
crash(Exception::MKXPError, "%s", msg)
|
||||
|
||||
void initGLFunctions(){
|
||||
#define EXT_SUFFIX ""
|
||||
GL_20_FUN;
|
||||
|
|
@ -94,7 +91,7 @@ void initGLFunctions(){
|
|||
int glMajor = *ver - '0';
|
||||
|
||||
if (glMajor < 2)
|
||||
throw EXC("At least OpenGL (ES) 2.0 is required");
|
||||
crash(Exception::MKXPError, "At least OpenGL (ES) 2.0 is required");
|
||||
|
||||
if (gles){
|
||||
GL_ES_FUN;
|
||||
|
|
@ -129,7 +126,7 @@ void initGLFunctions(){
|
|||
}
|
||||
}
|
||||
else{
|
||||
throw EXC("No FBO support available");
|
||||
crash(Exception::MKXPError, "No FBO support available");
|
||||
}
|
||||
|
||||
/* VAO entrypoints */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ void crash(Exception::Type t, const char *fmt, ...){
|
|||
va_copy(args_copy, args);
|
||||
short len = SDL_vsnprintf(NULL, 0, fmt, args_copy);
|
||||
va_end(args_copy);
|
||||
char *buf = SDL_malloc((size_t)len + 1);
|
||||
char *buf = (char*)SDL_malloc((size_t)len + 1);
|
||||
SDL_vsnprintf(buf, (size_t)len + 1, fmt, args);
|
||||
va_end(args);
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ void crash(Exception::Type t, const char *fmt, ...){
|
|||
|
||||
int buttonid = 0;
|
||||
if (SDL_ShowMessageBox(&messageboxdata, &buttonid) == false) {
|
||||
printf("[CRASHDUMP] %s\n", reason);
|
||||
printf("[CRASHDUMP] %s\n", buf);
|
||||
}
|
||||
|
||||
if(buttonid == 1){
|
||||
|
|
@ -78,7 +78,7 @@ void crash(Exception::Type t, const char *fmt, ...){
|
|||
out << "[SUNSHINE CRASHDUMP]" << std::endl;
|
||||
try{
|
||||
out << boost::stacktrace::stacktrace() << std::endl;
|
||||
out << "REASON: " << reason << std::endl;
|
||||
out << "REASON: " << buf << std::endl;
|
||||
out << "GL Vendor: " << glGetStringInt(GL_VENDOR) << std::endl;
|
||||
out << "GL Renderer: " << glGetStringInt(GL_RENDERER) << std::endl;
|
||||
out << "GL Version: " << glGetStringInt(GL_VERSION) << std::endl;
|
||||
|
|
|
|||
|
|
@ -16,33 +16,32 @@
|
|||
#include <SDL3/SDL_messagebox.h>
|
||||
|
||||
// OS-Specific code
|
||||
#if defined _WIN32
|
||||
#define OS_W32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define SECURITY_WIN32
|
||||
#include <windows.h>
|
||||
#include <mmsystem.h>
|
||||
#include <security.h>
|
||||
#include <shlobj.h>
|
||||
#elif defined __APPLE__ || __linux__ || BSD
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <pwd.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define OS_OSX
|
||||
#include <dispatch/dispatch.h>
|
||||
#else
|
||||
#define OS_LINUX || BSD
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include "xdg-user-dir-lookup.h"
|
||||
#endif
|
||||
#if defined(_WIN32)
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define SECURITY_WIN32
|
||||
#include <windows.h>
|
||||
#include <mmsystem.h>
|
||||
#include <security.h>
|
||||
#include <shlobj.h>
|
||||
#elif defined(__APPLE__)
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <pwd.h>
|
||||
#include <dlfcn.h>
|
||||
#include <dispatch/dispatch.h>
|
||||
#elif defined(__linux__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <pwd.h>
|
||||
#include <dlfcn.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include "xdg-user-dir-lookup.h"
|
||||
#else
|
||||
#error "Operating system not detected or unsupported."
|
||||
#error "Operating system not detected or unsupported."
|
||||
#endif
|
||||
|
||||
|
||||
const Config conf;
|
||||
#define DEF_SCREEN_W conf.defScreenW
|
||||
#define DEF_SCREEN_H conf.defScreenH
|
||||
|
|
@ -87,7 +86,7 @@ struct OneshotPrivate{
|
|||
};
|
||||
|
||||
//OS-SPECIFIC FUNCTIONS
|
||||
#if defined OS_LINUX || BSD
|
||||
#if defined(__linux__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
struct linux_DialogData{
|
||||
// Input
|
||||
int type;
|
||||
|
|
@ -134,7 +133,7 @@ static int linux_dialog(void *rawData){
|
|||
return 0;
|
||||
}
|
||||
|
||||
#elif defined OS_W32
|
||||
#elif defined _WIN32
|
||||
/* Convert WCHAR pointer to std::string */
|
||||
static std::string w32_fromWide(const WCHAR *ustr){
|
||||
std::string result;
|
||||
|
|
@ -178,20 +177,20 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
|
|||
p->winPosChanged = false;
|
||||
p->allowExit = true;
|
||||
p->exiting = false;
|
||||
#ifdef OS_W32
|
||||
#ifdef _WIN32
|
||||
p->os = "windows";
|
||||
#elif defined OS_OSX
|
||||
#elif __APPLE__
|
||||
p->os = "macos";
|
||||
#elif defined BSD
|
||||
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(BSD)
|
||||
p->os = "BSD";
|
||||
#else
|
||||
#elif __LINUX__
|
||||
p->os = "linux";
|
||||
#endif
|
||||
|
||||
/********************
|
||||
* USERNAME/DOCS PATH
|
||||
********************/
|
||||
#if defined OS_W32
|
||||
#if defined _WIN32
|
||||
//Get language code
|
||||
WCHAR wlang[9];
|
||||
GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SISO639LANGNAME, wlang, sizeof(wlang) / sizeof(WCHAR));
|
||||
|
|
@ -242,7 +241,7 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
|
|||
// Get user's name
|
||||
#ifdef OS_OSX
|
||||
struct passwd *pwd = getpwuid(geteuid());
|
||||
#elif defined OS_LINUX
|
||||
#elif defined(__linux__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
struct passwd *pwd = getpwuid(getuid());
|
||||
#endif
|
||||
if (pwd){
|
||||
|
|
@ -256,12 +255,12 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
|
|||
}
|
||||
|
||||
// Get documents path
|
||||
#ifdef OS_OSX
|
||||
#ifdef __APPLE__
|
||||
std::string path = std::string(getenv("HOME")) + "/Documents";
|
||||
p->docsPath = path.c_str();
|
||||
p->gamePath = path.c_str();
|
||||
p->journal = "_______.app";
|
||||
#elif defined OS_LINUX
|
||||
#elif defined(__linux__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
char * path = xdg_user_dir_lookup("DOCUMENTS");
|
||||
p->docsPath = path;
|
||||
p->gamePath = path;
|
||||
|
|
@ -272,7 +271,7 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
|
|||
Debug() << "[oneshot] Game path :" << p->gamePath;
|
||||
Debug() << "[oneshot] Docs path :" << p->docsPath;
|
||||
|
||||
#ifdef OS_LINUX
|
||||
#ifdef defined(__linux__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
char const* xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP");
|
||||
gtk_init(0, 0);
|
||||
|
||||
|
|
@ -309,7 +308,7 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
|
|||
/********
|
||||
* MISC
|
||||
********/
|
||||
#if defined OS_W32
|
||||
#if defined _WIN32
|
||||
//Get windows version
|
||||
OSVERSIONINFOW version;
|
||||
ZeroMemory(&version, sizeof(version));
|
||||
|
|
@ -461,7 +460,7 @@ void Oneshot::setAllowExit(bool allowExit){
|
|||
bool Oneshot::msgbox(int type, const char *body, const char *title){
|
||||
if (!title)
|
||||
title = "";
|
||||
#ifdef OS_LINUX
|
||||
#ifdef defined(__linux__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
linux_DialogData data = {type, body, title, 0};
|
||||
gdk_threads_add_idle(linux_dialog, &data);
|
||||
gtk_main();
|
||||
|
|
@ -482,7 +481,7 @@ bool Oneshot::msgbox(int type, const char *body, const char *title){
|
|||
data.colorScheme = 0;
|
||||
data.title = title;
|
||||
data.message = body;
|
||||
#ifdef OS_W32
|
||||
#ifdef _WIN32
|
||||
DWORD sound;
|
||||
#endif
|
||||
|
||||
|
|
@ -492,19 +491,19 @@ bool Oneshot::msgbox(int type, const char *body, const char *title){
|
|||
case MSG_YESNO:
|
||||
default:
|
||||
data.flags = SDL_MESSAGEBOX_INFORMATION;
|
||||
#ifdef OS_W32
|
||||
#ifdef _WIN32
|
||||
sound = SND_ALIAS_SYSTEMQUESTION;
|
||||
#endif
|
||||
break;
|
||||
case MSG_WARN:
|
||||
data.flags = SDL_MESSAGEBOX_WARNING;
|
||||
#ifdef OS_W32
|
||||
#ifdef _WIN32
|
||||
sound = SND_ALIAS_SYSTEMEXCLAMATION;
|
||||
#endif
|
||||
break;
|
||||
case MSG_ERR:
|
||||
data.flags = SDL_MESSAGEBOX_WARNING;
|
||||
#ifdef OS_W32
|
||||
#ifdef _WIN32
|
||||
sound = SND_ALIAS_SYSTEMASTERISK;
|
||||
#endif
|
||||
break;
|
||||
|
|
@ -526,12 +525,12 @@ bool Oneshot::msgbox(int type, const char *body, const char *title){
|
|||
}
|
||||
|
||||
// Show messagebox
|
||||
#ifdef OS_W32
|
||||
#ifdef _WIN32
|
||||
PlaySoundW((LPCWSTR)sound, NULL, SND_ALIAS_ID | SND_ASYNC);
|
||||
#endif
|
||||
int button;
|
||||
|
||||
#ifdef OS_OSX
|
||||
#ifdef __APPLE__
|
||||
int *btn = &button;
|
||||
|
||||
// Message boxes and UI changes must be performed from the main thread on macOS Mojave and above.
|
||||
|
|
|
|||
Loading…
Reference in a new issue