mirror of https://github.com/bsnes-emu/bsnes.git
Update to purify v00r07 release.
byuu says: This update uses the latest manifest.xml mappings. It also adds a new "Update Manifests" button that can be used to quickly regenerate all manifests (sans Famicom games ... since I strip the iNES header, that information is gone. We can't support Famicom manifest.xml updates until we have a database.) This is different than the before wrapping of the functionality on the convert games button. You can also trigger this on the command-line with "purify synchronize" g6672D, great catch. This was fixed, thank you. [g6672D's bug was: "SA-1 and SuperFX are missing the "0x" for program.rom/save.rwm size." - Ed.]
This commit is contained in:
Tim Allen
parent
87cb164f7c
commit
4cb8b51606
|
|
@ -35,7 +35,7 @@ extern "C" usartproc void usart_init(
|
|||
usart_write = write;
|
||||
}
|
||||
|
||||
extern "C" usartproc void usart_main();
|
||||
extern "C" usartproc void usart_main(int, char**);
|
||||
|
||||
//
|
||||
|
||||
|
|
@ -84,21 +84,19 @@ static void sigint(int) {
|
|||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
//requires superuser privileges; otherwise priority = +0
|
||||
setpriority(PRIO_PROCESS, 0, -20);
|
||||
setpriority(PRIO_PROCESS, 0, -20); //requires superuser privileges; otherwise priority = +0
|
||||
signal(SIGINT, sigint);
|
||||
|
||||
bool result = false;
|
||||
if(argc == 1) result = usart.open("/dev/ttyACM0", 57600, true);
|
||||
if(argc == 2) result = usart.open(argv[1], 57600, true);
|
||||
if(result == false) {
|
||||
if(usart.open("/dev/ttyACM0", 57600, true) == false) {
|
||||
printf("error: unable to open USART hardware device\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
usart_is_virtual = false;
|
||||
usart_init(usarthw_quit, usarthw_usleep, usarthw_readable, usarthw_read, usarthw_writable, usarthw_write);
|
||||
usart_main();
|
||||
usart_main(argc, argv);
|
||||
usart.close();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -242,14 +242,14 @@ SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size)
|
|||
" <superfx revision='2'>\n"
|
||||
" <map address='00-3f:3000-32ff' id='io'/>\n"
|
||||
" <map address='80-bf:3000-32ff' id='io'/>\n"
|
||||
" <rom name='program.rom' size='", hex(rom_size), "'/>\n"
|
||||
" <rom name='program.rom' size='0x", hex(rom_size), "'/>\n"
|
||||
" <map address='00-3f:8000-ffff' id='rom' mode='linear'/>\n"
|
||||
" <map address='80-bf:8000-ffff' id='rom' mode='linear'/>\n"
|
||||
" <map address='40-5f:0000-ffff' id='rom' mode='linear'/>\n"
|
||||
" <map address='c0-df:0000-ffff' id='rom' mode='linear'/>\n"
|
||||
);
|
||||
if(ram_size > 0) markup.append(
|
||||
" <ram name='save.rwm' size='", hex(ram_size), "'/>\n"
|
||||
" <ram name='save.rwm' size='0x", hex(ram_size), "'/>\n"
|
||||
" <map address='00-3f:6000-7fff' id='ram' mode='linear' size='0x2000'/>\n"
|
||||
" <map address='80-bf:6000-7fff' id='ram' mode='linear' size='0x2000'/>\n"
|
||||
" <map address='60-7f:0000-ffff' id='ram' mode='linear'/>\n"
|
||||
|
|
@ -265,7 +265,7 @@ SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size)
|
|||
" <sa1>\n"
|
||||
" <map address='00-3f:2200-23ff' id='io'/>\n"
|
||||
" <map address='80-bf:2200-23ff' id='io'/>\n"
|
||||
" <rom name='program.rom' size='", hex(rom_size), "'/>\n"
|
||||
" <rom name='program.rom' size='0x", hex(rom_size), "'/>\n"
|
||||
" <map address='00-3f:8000-ffff' id='rom'/>\n"
|
||||
" <map address='80-bf:8000-ffff' id='rom'/>\n"
|
||||
" <map address='c0-ff:0000-ffff' id='rom'/>\n"
|
||||
|
|
@ -274,7 +274,7 @@ SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size)
|
|||
" <map address='80-bf:3000-37ff' id='iram'/>\n"
|
||||
);
|
||||
if(ram_size > 0) markup.append(
|
||||
" <bwram name='save.rwm' size='", hex(ram_size), "'/>\n"
|
||||
" <bwram name='save.rwm' size='0x", hex(ram_size), "'/>\n"
|
||||
" <map address='00-3f:6000-7fff' id='bwram'/>\n"
|
||||
" <map address='80-bf:6000-7fff' id='bwram'/>\n"
|
||||
" <map address='40-4f:0000-ffff' id='bwram'/>\n"
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ struct stream {
|
|||
|
||||
struct byte {
|
||||
operator uint8_t() const { return s.read(offset); }
|
||||
byte& operator=(uint8_t data) { s.write(offset, data); }
|
||||
byte& operator=(uint8_t data) { s.write(offset, data); return *this; }
|
||||
byte(const stream &s, unsigned offset) : s(s), offset(offset) {}
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include <nall/string/trim.hpp>
|
||||
#include <nall/string/replace.hpp>
|
||||
#include <nall/string/split.hpp>
|
||||
#include <nall/string/static.hpp>
|
||||
#include <nall/string/utf8.hpp>
|
||||
#include <nall/string/utility.hpp>
|
||||
#include <nall/string/variadic.hpp>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ namespace nall {
|
|||
};
|
||||
|
||||
struct string {
|
||||
inline static string read(const string &filename);
|
||||
|
||||
inline void reserve(unsigned);
|
||||
inline bool empty() const;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
#ifdef NALL_STRING_INTERNAL_HPP
|
||||
|
||||
namespace nall {
|
||||
|
||||
string string::read(const string &filename) {
|
||||
string data;
|
||||
data.readfile(filename);
|
||||
return data;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -29,7 +29,7 @@ namespace nall {
|
|||
unsigned capacity() const { return poolsize; }
|
||||
|
||||
T* move() {
|
||||
T *result = data;
|
||||
T *result = pool;
|
||||
pool = nullptr;
|
||||
poolsize = 0;
|
||||
objectsize = 0;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
#endif
|
||||
|
||||
static bool OS_quit = false;
|
||||
Window Window::None;
|
||||
|
||||
//Color
|
||||
//=====
|
||||
|
|
@ -211,6 +210,10 @@ Timer::~Timer() {
|
|||
//Window
|
||||
//======
|
||||
|
||||
Window& Window::none() {
|
||||
return pWindow::none();
|
||||
}
|
||||
|
||||
void Window::append_(Layout &layout) {
|
||||
if(state.layout.append(layout)) {
|
||||
((Sizable&)layout).state.window = this;
|
||||
|
|
|
|||
|
|
@ -167,13 +167,14 @@ struct Timer : private nall::base_from_member<pTimer&>, Object {
|
|||
};
|
||||
|
||||
struct Window : private nall::base_from_member<pWindow&>, Object {
|
||||
static Window None;
|
||||
nall::function<void ()> onClose;
|
||||
nall::function<void (Keyboard::Keycode)> onKeyPress;
|
||||
nall::function<void (Keyboard::Keycode)> onKeyRelease;
|
||||
nall::function<void ()> onMove;
|
||||
nall::function<void ()> onSize;
|
||||
|
||||
static Window& none();
|
||||
|
||||
inline void append() {}
|
||||
inline void remove() {}
|
||||
template<typename T, typename... Args> void append(T &arg, Args&... args) { append_(arg); append(args...); }
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ static string FileDialog(bool save, Window &parent, const string &path, const ls
|
|||
|
||||
GtkWidget *dialog = gtk_file_chooser_dialog_new(
|
||||
save == 0 ? "Load File" : "Save File",
|
||||
&parent != &Window::None ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)0,
|
||||
&parent != &Window::none() ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)nullptr,
|
||||
save == 0 ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
||||
(const gchar*)0
|
||||
(const gchar*)nullptr
|
||||
);
|
||||
|
||||
if(path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
|
||||
|
|
@ -47,11 +47,11 @@ string pDialogWindow::folderSelect(Window &parent, const string &path) {
|
|||
|
||||
GtkWidget *dialog = gtk_file_chooser_dialog_new(
|
||||
"Select Folder",
|
||||
&parent != &Window::None ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)0,
|
||||
&parent != &Window::none() ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)nullptr,
|
||||
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
||||
(const gchar*)0
|
||||
(const gchar*)nullptr
|
||||
);
|
||||
|
||||
if(path) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ MessageWindow::Response pMessageWindow::information(Window &parent, const string
|
|||
if(buttons == MessageWindow::Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
|
||||
GtkWidget *dialog = gtk_message_dialog_new(
|
||||
&parent != &Window::None ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)0,
|
||||
&parent != &Window::none() ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)nullptr,
|
||||
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, buttonsType, "%s", (const char*)text
|
||||
);
|
||||
gint response = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
|
@ -26,7 +26,7 @@ MessageWindow::Response pMessageWindow::question(Window &parent, const string &t
|
|||
if(buttons == MessageWindow::Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
|
||||
GtkWidget *dialog = gtk_message_dialog_new(
|
||||
&parent != &Window::None ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)0,
|
||||
&parent != &Window::none() ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)nullptr,
|
||||
GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, buttonsType, "%s", (const char*)text
|
||||
);
|
||||
gint response = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
|
@ -39,7 +39,7 @@ MessageWindow::Response pMessageWindow::warning(Window &parent, const string &te
|
|||
if(buttons == MessageWindow::Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
|
||||
GtkWidget *dialog = gtk_message_dialog_new(
|
||||
&parent != &Window::None ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)0,
|
||||
&parent != &Window::none() ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)nullptr,
|
||||
GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, buttonsType, "%s", (const char*)text
|
||||
);
|
||||
gint response = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
|
@ -52,7 +52,7 @@ MessageWindow::Response pMessageWindow::critical(Window &parent, const string &t
|
|||
if(buttons == MessageWindow::Buttons::OkCancel) buttonsType = GTK_BUTTONS_OK_CANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) buttonsType = GTK_BUTTONS_YES_NO;
|
||||
GtkWidget *dialog = gtk_message_dialog_new(
|
||||
&parent != &Window::None ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)0,
|
||||
&parent != &Window::none() ? GTK_WINDOW(parent.p.widget) : (GtkWindow*)nullptr,
|
||||
GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, buttonsType, "%s", (const char*)text
|
||||
);
|
||||
gint response = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@ struct pWindow : public pObject {
|
|||
GtkAllocation lastAllocation;
|
||||
bool onSizePending;
|
||||
|
||||
static Window& none();
|
||||
|
||||
void append(Layout &layout);
|
||||
void append(Menu &menu);
|
||||
void append(Widget &widget);
|
||||
|
|
|
|||
|
|
@ -116,6 +116,12 @@ static void Window_sizeRequest(GtkWidget *widget, GtkRequisition *requisition, W
|
|||
requisition->height = window->state.geometry.height;
|
||||
}
|
||||
|
||||
Window& pWindow::none() {
|
||||
static Window *window = nullptr;
|
||||
if(window == nullptr) window = new Window;
|
||||
return *window;
|
||||
}
|
||||
|
||||
void pWindow::append(Layout &layout) {
|
||||
Geometry geometry = this->geometry();
|
||||
geometry.x = geometry.y = 0;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ string pDialogWindow::fileOpen(Window &parent, const string &path, const lstring
|
|||
}
|
||||
|
||||
QString filename = QFileDialog::getOpenFileName(
|
||||
&parent != &Window::None ? parent.p.qtWindow : 0, "Load File",
|
||||
&parent != &Window::none() ? parent.p.qtWindow : nullptr, "Open File",
|
||||
QString::fromUtf8(path), QString::fromUtf8(filterList)
|
||||
);
|
||||
return filename.toUtf8().constData();
|
||||
|
|
@ -40,7 +40,7 @@ string pDialogWindow::fileSave(Window &parent, const string &path, const lstring
|
|||
}
|
||||
|
||||
QString filename = QFileDialog::getSaveFileName(
|
||||
&parent != &Window::None ? parent.p.qtWindow : 0, "Save File",
|
||||
&parent != &Window::none() ? parent.p.qtWindow : nullptr, "Save File",
|
||||
QString::fromUtf8(path), QString::fromUtf8(filterList)
|
||||
);
|
||||
return filename.toUtf8().constData();
|
||||
|
|
@ -48,7 +48,7 @@ string pDialogWindow::fileSave(Window &parent, const string &path, const lstring
|
|||
|
||||
string pDialogWindow::folderSelect(Window &parent, const string &path) {
|
||||
QString directory = QFileDialog::getExistingDirectory(
|
||||
&parent != &Window::None ? parent.p.qtWindow : 0, "Select Directory",
|
||||
&parent != &Window::none() ? parent.p.qtWindow : nullptr, "Select Directory",
|
||||
QString::fromUtf8(path), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
|
||||
);
|
||||
string name = directory.toUtf8().constData();
|
||||
|
|
|
|||
|
|
@ -20,28 +20,28 @@ static MessageWindow::Response MessageWindow_response(MessageWindow::Buttons but
|
|||
|
||||
MessageWindow::Response pMessageWindow::information(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
return MessageWindow_response(
|
||||
buttons, QMessageBox::information(&parent != &Window::None ? parent.p.qtWindow : 0, " ",
|
||||
buttons, QMessageBox::information(&parent != &Window::none() ? parent.p.qtWindow : nullptr, " ",
|
||||
QString::fromUtf8(text), MessageWindow_buttons(buttons))
|
||||
);
|
||||
}
|
||||
|
||||
MessageWindow::Response pMessageWindow::question(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
return MessageWindow_response(
|
||||
buttons, QMessageBox::question(&parent != &Window::None ? parent.p.qtWindow : 0, " ",
|
||||
buttons, QMessageBox::question(&parent != &Window::none() ? parent.p.qtWindow : nullptr, " ",
|
||||
QString::fromUtf8(text), MessageWindow_buttons(buttons))
|
||||
);
|
||||
}
|
||||
|
||||
MessageWindow::Response pMessageWindow::warning(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
return MessageWindow_response(
|
||||
buttons, QMessageBox::warning(&parent != &Window::None ? parent.p.qtWindow : 0, " ",
|
||||
buttons, QMessageBox::warning(&parent != &Window::none() ? parent.p.qtWindow : nullptr, " ",
|
||||
QString::fromUtf8(text), MessageWindow_buttons(buttons))
|
||||
);
|
||||
}
|
||||
|
||||
MessageWindow::Response pMessageWindow::critical(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
return MessageWindow_response(
|
||||
buttons, QMessageBox::critical(&parent != &Window::None ? parent.p.qtWindow : 0, " ",
|
||||
buttons, QMessageBox::critical(&parent != &Window::none() ? parent.p.qtWindow : nullptr, " ",
|
||||
QString::fromUtf8(text), MessageWindow_buttons(buttons))
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/****************************************************************************
|
||||
** Meta object code from reading C++ file 'platform.moc.hpp'
|
||||
**
|
||||
** Created: Mon Jun 18 07:31:52 2012
|
||||
** Created: Sun Jul 22 02:20:29 2012
|
||||
** by: The Qt Meta Object Compiler version 62 (Qt 4.6.3)
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
|
|
|
|||
|
|
@ -117,6 +117,8 @@ public:
|
|||
QStatusBar *qtStatus;
|
||||
QWidget *qtContainer;
|
||||
|
||||
static Window& none();
|
||||
|
||||
void append(Layout &layout);
|
||||
void append(Menu &menu);
|
||||
void append(Widget &widget);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
Window& pWindow::none() {
|
||||
static Window *window = nullptr;
|
||||
if(window == nullptr) window = new Window;
|
||||
return *window;
|
||||
}
|
||||
|
||||
void pWindow::append(Layout &layout) {
|
||||
Geometry geometry = window.state.geometry;
|
||||
geometry.x = geometry.y = 0;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ static string FileDialog(bool save, Window &parent, const string &path, const ls
|
|||
OPENFILENAME ofn;
|
||||
memset(&ofn, 0, sizeof(OPENFILENAME));
|
||||
ofn.lStructSize = sizeof(OPENFILENAME);
|
||||
ofn.hwndOwner = &parent != &Window::None ? parent.p.hwnd : 0;
|
||||
ofn.hwndOwner = &parent != &Window::none() ? parent.p.hwnd : 0;
|
||||
ofn.lpstrFilter = wfilter;
|
||||
ofn.lpstrInitialDir = wdir;
|
||||
ofn.lpstrFile = wfilename;
|
||||
|
|
@ -59,7 +59,7 @@ string pDialogWindow::fileSave(Window &parent, const string &path, const lstring
|
|||
string pDialogWindow::folderSelect(Window &parent, const string &path) {
|
||||
wchar_t wfilename[PATH_MAX + 1] = L"";
|
||||
BROWSEINFO bi;
|
||||
bi.hwndOwner = &parent != &Window::None ? parent.p.hwnd : 0;
|
||||
bi.hwndOwner = &parent != &Window::none() ? parent.p.hwnd : 0;
|
||||
bi.pidlRoot = NULL;
|
||||
bi.pszDisplayName = wfilename;
|
||||
bi.lpszTitle = L"";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ MessageWindow::Response pMessageWindow::information(Window &parent, const string
|
|||
if(buttons == MessageWindow::Buttons::Ok) flags |= MB_OK;
|
||||
if(buttons == MessageWindow::Buttons::OkCancel) flags |= MB_OKCANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) flags |= MB_YESNO;
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::None ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::none() ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
}
|
||||
|
||||
MessageWindow::Response pMessageWindow::question(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
|
|
@ -21,7 +21,7 @@ MessageWindow::Response pMessageWindow::question(Window &parent, const string &t
|
|||
if(buttons == MessageWindow::Buttons::Ok) flags |= MB_OK;
|
||||
if(buttons == MessageWindow::Buttons::OkCancel) flags |= MB_OKCANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) flags |= MB_YESNO;
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::None ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::none() ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
}
|
||||
|
||||
MessageWindow::Response pMessageWindow::warning(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
|
|
@ -29,7 +29,7 @@ MessageWindow::Response pMessageWindow::warning(Window &parent, const string &te
|
|||
if(buttons == MessageWindow::Buttons::Ok) flags |= MB_OK;
|
||||
if(buttons == MessageWindow::Buttons::OkCancel) flags |= MB_OKCANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) flags |= MB_YESNO;
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::None ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::none() ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
}
|
||||
|
||||
MessageWindow::Response pMessageWindow::critical(Window &parent, const string &text, MessageWindow::Buttons buttons) {
|
||||
|
|
@ -37,5 +37,5 @@ MessageWindow::Response pMessageWindow::critical(Window &parent, const string &t
|
|||
if(buttons == MessageWindow::Buttons::Ok) flags |= MB_OK;
|
||||
if(buttons == MessageWindow::Buttons::OkCancel) flags |= MB_OKCANCEL;
|
||||
if(buttons == MessageWindow::Buttons::YesNo) flags |= MB_YESNO;
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::None ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
return MessageWindow_response(buttons, MessageBox(&parent != &Window::none() ? parent.p.hwnd : 0, utf16_t(text), L"", flags));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,6 +96,8 @@ struct pWindow : public pObject {
|
|||
HBRUSH brush;
|
||||
COLORREF brushColor;
|
||||
|
||||
static Window& none();
|
||||
|
||||
void append(Layout &layout);
|
||||
void append(Menu &menu);
|
||||
void append(Widget &widget);
|
||||
|
|
@ -228,7 +230,7 @@ struct pWidget : public pSizable {
|
|||
virtual void setGeometry(const Geometry &geometry);
|
||||
void setVisible(bool visible);
|
||||
|
||||
pWidget(Widget &widget) : pSizable(widget), widget(widget) { parentWindow = &Window::None; }
|
||||
pWidget(Widget &widget) : pSizable(widget), widget(widget) { parentWindow = &Window::none(); }
|
||||
void constructor();
|
||||
void destructor();
|
||||
virtual void orphan();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
static linear_vector<pTimer*> timers;
|
||||
static vector<pTimer*> timers;
|
||||
|
||||
static void CALLBACK Timer_timeoutProc(HWND hwnd, UINT msg, UINT_PTR timerID, DWORD time) {
|
||||
for(auto &timer : timers) {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@ void pWindow::updateModality() {
|
|||
static const unsigned FixedStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_BORDER;
|
||||
static const unsigned ResizableStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME;
|
||||
|
||||
Window& pWindow::none() {
|
||||
static Window *window = nullptr;
|
||||
if(window == nullptr) window = new Window;
|
||||
return *window;
|
||||
}
|
||||
|
||||
void pWindow::append(Layout &layout) {
|
||||
Geometry geom = window.state.geometry;
|
||||
geom.x = geom.y = 0;
|
||||
|
|
|
|||
|
|
@ -99,8 +99,9 @@ void create_super_famicom(const string &filename, uint8_t *data, unsigned size)
|
|||
if(!file::exists({path, "save.rwm"})) file::copy({nall::basename(filename), ".srm"}, {path, "save.rwm"});
|
||||
|
||||
//firmware
|
||||
if(auto position = information.markup.position("firmware=")) {
|
||||
string firmware = substr(information.markup, position() + 10);
|
||||
string firmwareID = "<firmware name=\"";
|
||||
if(auto position = information.markup.position(firmwareID)) {
|
||||
string firmware = substr(information.markup, position() + firmwareID.length());
|
||||
if(auto position = firmware.position("\"")) {
|
||||
firmware[position()] = 0;
|
||||
if(file::copy({dir(filename), firmware}, {path, firmware}) == false) {
|
||||
|
|
@ -232,6 +233,12 @@ void create_manifest(const string &path) {
|
|||
if(path.iendswith(".sfc/") && file::exists({path, "program.rom"})) {
|
||||
print(name, "\n");
|
||||
auto buffer = file::read({path, "program.rom"});
|
||||
if(file::exists({path, "data.rom"})) { //SPC7110 ROMs consist of program.rom + data.rom
|
||||
auto prom = buffer;
|
||||
auto drom = file::read({path, "data.rom"});
|
||||
buffer.resize(prom.size() + drom.size());
|
||||
memcpy(buffer.data() + prom.size(), drom.data(), drom.size());
|
||||
}
|
||||
SuperFamicomCartridge information(buffer.data(), buffer.size());
|
||||
file::write({path, "manifest.xml"}, (const uint8_t*)information.markup(), information.markup.length());
|
||||
}
|
||||
|
|
@ -265,6 +272,22 @@ void create_manifest(const string &path) {
|
|||
}
|
||||
}
|
||||
|
||||
//$ purify synchronize
|
||||
//this function recursively scans directories; as purify uses nested folders for different systems
|
||||
void synchronize_manifests(string pathname) {
|
||||
pathname.transform("\\", "/");
|
||||
if(pathname.endswith("/") == false) pathname.append("/");
|
||||
|
||||
lstring folders = directory::folders(pathname);
|
||||
for(auto &folder : folders) {
|
||||
if(valid_extension(folder)) {
|
||||
create_manifest({pathname, folder});
|
||||
} else {
|
||||
synchronize_manifests({pathname, folder});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void create_folder(string pathname) {
|
||||
pathname.transform("\\", "/");
|
||||
if(pathname.endswith("/") == false) pathname.append("/");
|
||||
|
|
@ -279,9 +302,7 @@ void create_folder(string pathname) {
|
|||
|
||||
lstring files = directory::contents(pathname);
|
||||
for(auto &name : files) {
|
||||
if(directory::exists({pathname, name}) && valid_extension(name)) {
|
||||
create_manifest({pathname, name});
|
||||
} else if(name.iendswith(".zip")) {
|
||||
if(name.iendswith(".zip")) {
|
||||
create_zip({pathname, name});
|
||||
} else {
|
||||
create_file({pathname, name});
|
||||
|
|
@ -322,9 +343,7 @@ struct Progress : Window {
|
|||
name.rtrim<1>("/");
|
||||
fileName.setText(notdir(name));
|
||||
|
||||
if(directory::exists({pathname, filename}) && valid_extension(name)) {
|
||||
create_manifest({pathname, filename});
|
||||
} else if(filename.iendswith(".zip")) {
|
||||
if(filename.iendswith(".zip")) {
|
||||
create_zip({pathname, filename});
|
||||
} else {
|
||||
create_file({pathname, filename});
|
||||
|
|
@ -375,16 +394,20 @@ struct Application : Window {
|
|||
HorizontalLayout configLayout;
|
||||
Button emulatorButton;
|
||||
Button pathButton;
|
||||
HorizontalLayout emulatorLayout;
|
||||
Label emulatorName;
|
||||
Label emulatorValue;
|
||||
HorizontalLayout pathLayout;
|
||||
Label pathName;
|
||||
Label pathValue;
|
||||
HorizontalLayout gridLayout;
|
||||
VerticalLayout labelLayout;
|
||||
HorizontalLayout emulatorLayout;
|
||||
Label emulatorName;
|
||||
Label emulatorValue;
|
||||
HorizontalLayout pathLayout;
|
||||
Label pathName;
|
||||
Label pathValue;
|
||||
VerticalLayout synchronizeLayout;
|
||||
Button synchronizeButton;
|
||||
|
||||
Application() {
|
||||
setTitle("purify v00.06");
|
||||
setGeometry({128, 128, 440, 180});
|
||||
setTitle("purify v00.07");
|
||||
setGeometry({128, 128, 600, 200});
|
||||
layout.setMargin(5);
|
||||
title.setFont("Sans, 16, Bold");
|
||||
title.setText("Choose Action");
|
||||
|
|
@ -402,6 +425,8 @@ struct Application : Window {
|
|||
pathName.setFont("Sans, 8, Bold");
|
||||
pathName.setText("Output Path:");
|
||||
pathValue.setText(settings.path);
|
||||
synchronizeButton.setImage({resource::synchronize, sizeof resource::synchronize});
|
||||
synchronizeButton.setText("Update Manifests");
|
||||
|
||||
Font font("Sans, 8, Bold");
|
||||
unsigned width = max(font.geometry("Emulator:").width, font.geometry("Output Path:").width);
|
||||
|
|
@ -414,18 +439,36 @@ struct Application : Window {
|
|||
layout.append(configLayout, {~0, ~0}, 5);
|
||||
configLayout.append(emulatorButton, {~0, ~0}, 5);
|
||||
configLayout.append(pathButton, {~0, ~0});
|
||||
layout.append(emulatorLayout, {~0, 0}, 5);
|
||||
emulatorLayout.append(emulatorName, {width, 0}, 5);
|
||||
emulatorLayout.append(emulatorValue, {~0, 0});
|
||||
layout.append(pathLayout, {~0, 0});
|
||||
pathLayout.append(pathName, {width, 0}, 5);
|
||||
pathLayout.append(pathValue, {~0, 0});
|
||||
layout.append(gridLayout, {~0, 0});
|
||||
gridLayout.append(labelLayout, {~0, 0}, 5);
|
||||
labelLayout.append(emulatorLayout, {~0, 0}, 5);
|
||||
emulatorLayout.append(emulatorName, {width, 0}, 5);
|
||||
emulatorLayout.append(emulatorValue, {~0, 0});
|
||||
labelLayout.append(pathLayout, {~0, 0});
|
||||
pathLayout.append(pathName, {width, 0}, 5);
|
||||
pathLayout.append(pathValue, {~0, 0});
|
||||
gridLayout.append(synchronizeLayout, {0, 0});
|
||||
synchronizeLayout.append(synchronizeButton, {0, 0});
|
||||
|
||||
onClose = &OS::quit;
|
||||
playButton.onActivate = {&Application::playAction, this};
|
||||
convertButton.onActivate = {&Application::convertAction, this};
|
||||
emulatorButton.onActivate = {&Application::emulatorAction, this};
|
||||
pathButton.onActivate = {&Application::pathAction, this};
|
||||
synchronizeButton.onActivate = [&] {
|
||||
if(MessageWindow::question(*this,
|
||||
"This will update all manifest.xml files located in your output path.\n"
|
||||
"This process may take a few minutes to complete.\n"
|
||||
"The user interface will not be responsive during this time.\n\n"
|
||||
"Would you like to proceed?"
|
||||
) == MessageWindow::Response::No) return;
|
||||
|
||||
layout.setEnabled(false);
|
||||
OS::processEvents();
|
||||
synchronize_manifests(settings.path);
|
||||
layout.setEnabled(true);
|
||||
MessageWindow::information(*this, "Process completed. All identified manifests have been updated.");
|
||||
};
|
||||
|
||||
setVisible();
|
||||
}
|
||||
|
|
@ -498,6 +541,11 @@ int main(int argc, char **argv) {
|
|||
args.append(argument);
|
||||
}
|
||||
|
||||
if(args.size() == 1 && args[0] == "synchronize") {
|
||||
synchronize_manifests(settings.path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(args.size() == 1 && directory::exists(args[0])) {
|
||||
create_folder(args[0]);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -212,4 +212,36 @@ const uint8_t path[1176] = {
|
|||
235,6,248,7,188,50,165,151,203,8,55,43,0,0,0,0,73,69,78,68,174,66,96,130,
|
||||
};
|
||||
|
||||
const uint8_t synchronize[912] = {
|
||||
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,0,31,243,255,
|
||||
97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,
|
||||
101,0,119,119,119,46,105,110,107,115,99,97,112,101,46,111,114,103,155,238,60,26,0,0,3,34,73,68,65,84,56,141,
|
||||
109,82,77,108,84,101,20,61,247,123,239,149,249,173,51,109,7,91,168,182,10,134,18,166,161,162,51,141,127,209,152,70,
|
||||
55,196,96,88,168,188,68,140,144,129,240,179,97,7,27,12,77,12,17,116,97,162,224,3,163,49,76,37,152,52,1,55,
|
||||
252,4,33,146,212,194,171,113,209,208,146,212,210,198,1,70,59,180,29,232,204,180,243,222,251,190,235,162,243,146,89,112,
|
||||
146,155,220,197,61,39,39,231,92,98,102,248,72,101,178,207,52,232,218,17,16,222,244,164,106,213,132,152,39,194,184,227,
|
||||
202,19,0,46,216,150,233,214,221,30,4,112,130,124,129,116,38,187,69,211,196,64,79,215,42,125,93,103,179,209,214,20,
|
||||
1,152,81,40,86,48,50,118,191,124,103,250,161,39,21,239,182,45,243,108,122,87,54,195,140,239,0,196,136,153,145,202,
|
||||
100,215,27,186,24,217,218,215,29,138,199,130,208,137,208,28,13,32,28,208,17,13,25,8,26,2,51,197,69,28,207,14,
|
||||
87,10,197,138,29,13,53,244,62,46,87,13,102,52,17,51,227,213,61,103,79,245,172,107,251,52,24,48,196,173,209,28,
|
||||
170,174,7,67,215,228,154,213,177,197,190,244,243,225,222,245,173,164,9,130,16,132,95,174,77,168,183,94,108,23,7,190,
|
||||
190,234,56,174,108,209,1,128,153,63,188,51,93,16,174,167,88,49,47,50,227,51,199,149,103,198,167,103,147,19,247,230,
|
||||
143,94,239,104,238,218,183,117,83,40,17,11,225,227,119,187,68,45,6,2,160,4,0,72,169,194,85,199,243,146,47,60,
|
||||
251,131,148,234,17,128,65,219,50,243,182,101,94,249,227,219,143,94,26,157,44,236,221,125,236,18,238,63,44,97,122,166,
|
||||
12,169,24,0,3,0,11,44,175,170,233,169,72,127,99,36,240,85,103,251,202,110,0,83,117,105,235,186,38,118,110,123,
|
||||
39,233,118,62,29,69,162,113,5,52,65,190,3,214,107,119,241,95,63,223,188,128,39,227,180,39,213,107,23,135,39,171,
|
||||
87,237,169,37,223,188,227,170,0,0,246,91,168,2,48,106,4,174,155,223,0,236,4,224,62,65,88,183,45,243,158,47,
|
||||
224,157,63,250,190,6,16,152,25,23,237,127,212,169,243,127,229,164,84,61,182,101,22,235,89,135,179,99,171,74,229,165,
|
||||
142,223,71,198,111,0,136,233,0,64,4,16,17,238,254,87,134,33,24,39,7,255,36,0,95,212,147,83,153,108,152,136,
|
||||
238,246,110,92,123,38,63,51,151,2,160,1,168,10,0,16,68,4,0,29,137,16,86,183,132,241,229,254,183,169,173,37,
|
||||
114,236,149,61,63,223,74,101,178,233,154,198,246,21,134,174,231,242,179,7,242,133,226,235,154,70,174,109,153,174,88,118,
|
||||
64,120,92,113,113,97,104,138,61,143,209,190,50,138,195,59,222,8,125,208,151,124,185,181,57,114,45,189,107,192,53,116,
|
||||
241,141,84,50,62,247,104,1,77,141,65,210,132,24,4,0,255,145,168,255,199,161,165,137,220,220,228,165,225,201,206,204,
|
||||
150,77,225,68,44,136,238,181,9,122,174,61,30,42,150,93,252,59,91,130,227,120,20,9,26,56,119,121,180,226,73,117,
|
||||
4,0,150,31,73,49,77,228,230,78,223,60,185,45,249,160,176,240,73,255,247,55,230,143,15,220,44,13,223,206,35,63,
|
||||
91,70,213,149,16,68,40,204,151,228,185,203,163,139,82,169,140,109,153,99,0,224,183,240,19,128,237,182,101,114,45,48,
|
||||
3,192,123,13,134,182,87,49,111,144,82,197,13,93,155,33,194,80,213,145,135,108,203,252,219,15,247,127,46,85,118,106,
|
||||
19,101,204,198,0,0,0,0,73,69,78,68,174,66,96,130,
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,4 +3,5 @@ namespace resource {
|
|||
extern const uint8_t convert[1155];
|
||||
extern const uint8_t emulator[2544];
|
||||
extern const uint8_t path[1176];
|
||||
extern const uint8_t synchronize[912];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,4 +4,5 @@
|
|||
<binary id="convert" name="drive-harddisk.png"/>
|
||||
<binary id="emulator" name="applications-system.png"/>
|
||||
<binary id="path" name="folder.png"/>
|
||||
<binary id="synchronize" name="view-refresh.png"/>
|
||||
</resource>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 912 B |
Loading…
Reference in New Issue