Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MorphOS: cleanup code #2994

Merged
merged 1 commit into from
May 1, 2021
Merged

MorphOS: cleanup code #2994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 6 additions & 38 deletions backends/dialogs/morphos/morphos-dialogs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
*/

#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#define FORBIDDEN_SYMBOL_EXCEPTION_strdup
#include "common/scummsys.h"

Expand All @@ -36,39 +34,12 @@
#include <proto/dos.h>
#define __NOLIBBASE__
#include <proto/asl.h>
#include <proto/charsets.h>

char *MorphosDialogManager::utf8ToLocal(char *in) {

if (!in) {
return strdup("");
}

struct Library *CharsetsBase = OpenLibrary("charsets.library", 0);
if (CharsetsBase) {

LONG dstmib = GetSystemCharset(NULL, 0);
if (dstmib != MIBENUM_INVALID) {
LONG dstlen = GetByteSize((APTR)in, -1, MIBENUM_UTF_8, dstmib);
char *out = (char *)malloc(dstlen + 1);
if (out) {
if (ConvertTagList((APTR)in, -1, (APTR)out, -1, MIBENUM_UTF_8, dstmib, NULL) != -1) {
return out;
}
free(out);
}
}
CloseLibrary(CharsetsBase);
}

return strdup(in);
}

Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const Common::U32String &title, Common::FSNode &choice, bool isDirBrowser) {

DialogResult result = kDialogCancel;
char pathBuffer[PATH_MAX];
Common::String utf8Title = title.encode();
Common::String newTitle = title.encode(Common::kISO8859_1);
struct Library *AslBase = OpenLibrary(AslName, 39);

if (AslBase) {
Expand All @@ -83,24 +54,21 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const

if (!fr)
return result;

char *newTitle = utf8ToLocal((char *)utf8Title.c_str());

if (AslRequestTags(fr, ASLFR_TitleText, (IPTR)newTitle, ASLFR_RejectIcons, TRUE, ASLFR_InitialDrawer, (IPTR)pathBuffer, ASLFR_DrawersOnly, (isDirBrowser ? TRUE : FALSE), TAG_DONE)) {

if (AslRequestTags(fr, ASLFR_TitleText, (IPTR)newTitle.c_str(), ASLFR_RejectIcons, TRUE, ASLFR_InitialDrawer, (IPTR)pathBuffer, ASLFR_DrawersOnly, (isDirBrowser ? TRUE : FALSE), TAG_DONE)) {

if (strlen(fr->fr_Drawer) < sizeof(pathBuffer)) {
strncpy(pathBuffer, fr->fr_Drawer, sizeof(pathBuffer));
ConfMan.set("browser_lastpath", pathBuffer); // only path
if (!isDirBrowser) {
AddPart(pathBuffer, fr->fr_File, sizeof(pathBuffer));
}
choice = Common::FSNode(pathBuffer);
ConfMan.set("browser_lastpath", pathBuffer);
choice = Common::FSNode(pathBuffer);
result = kDialogOk;
}
FreeAslRequest((APTR)fr);
}

free(newTitle);
FreeAslRequest((APTR)fr);
CloseLibrary(AslBase);
}

Expand Down
6 changes: 3 additions & 3 deletions backends/fs/morphos/morphos-fs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ MorphOSFilesystemNode::MorphOSFilesystemNode(const Common::String &p) {
return;
}

BPTR pLock = Lock((STRPTR)_sPath.c_str(), SHARED_LOCK);
BPTR pLock = Lock((CONST_STRPTR)_sPath.c_str(), SHARED_LOCK);
if (pLock) {
if (Examine(pLock, fib) != DOSFALSE) {
if (fib->fib_EntryType > 0) {
Expand Down Expand Up @@ -145,7 +145,7 @@ MorphOSFilesystemNode::MorphOSFilesystemNode(BPTR pLock, const char *pDisplayNam
if (fib->fib_EntryType != ST_ROOT)
_sPath += '/';
_pFileLock = DupLock(pLock);
_bIsValid = (_pFileLock != NULL);
if (_pFileLock) _bIsValid = true;
} else {
_bIsValid = true;
}
Expand Down Expand Up @@ -358,7 +358,7 @@ Common::WriteStream *MorphOSFilesystemNode::createWriteStream() {
}

bool MorphOSFilesystemNode::createDirectory() {
warning("AmigaOSFilesystemNode::createDirectory(): Not supported");
warning("MorphOSFilesystemNode::createDirectory(): Not supported");
return _bIsValid && _bIsDirectory;
}

Expand Down