Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 53 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"files.associations": {
"*.inc": "php",
"string": "cpp",
"vector": "cpp",
"array": "cpp",
"atomic": "cpp",
"*.tcc": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"unordered_map": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"random": "cpp",
"ratio": "cpp",
"set": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"new": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"typeinfo": "cpp"
}
}
54 changes: 53 additions & 1 deletion AmigaOS.cpp.wrapper.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,57 @@
"path": "."
}
],
"settings": {}
"settings": {
"files.associations": {
"*.inc": "php",
"stdexcept": "cpp",
"array": "cpp",
"atomic": "cpp",
"*.tcc": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"random": "cpp",
"set": "cpp",
"string": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"new": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"streambuf": "cpp",
"typeinfo": "cpp",
"chrono": "cpp",
"ratio": "cpp"
}
}
}
2 changes: 2 additions & 0 deletions wrappers/src/AOS/Cybergraphics/Library.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ namespace AOS::Cybergraphics

std::vector<Common::BoardID> Library::GetBoards() noexcept
{
// return { BoardID::Pixel64, BoardID::BlizzardVisionPPC, BoardID::RainbowIII };

std::vector<Common::BoardID> boards;
for (const auto &board : allBoards)
if (libBestCModeID(board.second) != (unsigned long)INVALID_ID)
Expand Down
2 changes: 1 addition & 1 deletion wrappers/src/AOS/Dos/Library.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#include "ValueTypes/GVF.hpp"

#include "std/optional.hpp"
#include <dos/dos.h>
#include <dos/dosextens.h>
#include <optional>
#include <string>
#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions wrappers/src/AOS/Icon/DiskObjectScope.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

namespace AOS::Icon
{
DiskObjectScope::DiskObjectScope(const std::string &diskObjectName)
DiskObjectScope::DiskObjectScope(const std::string &diskObjectName, bool exceptionOnError)
{
mpDiskObject = (struct DiskObject *)GetDiskObject((STRPTR)diskObjectName.c_str());
if (!mpDiskObject)
if (!mpDiskObject && exceptionOnError)
{
auto error = std::string { __PRETTY_FUNCTION__ } + " GetDiskObject(" + diskObjectName + ") failed!";
throw std::runtime_error(error);
Expand Down
4 changes: 2 additions & 2 deletions wrappers/src/AOS/Icon/DiskObjectScope.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ namespace AOS::Icon
struct DiskObject *mpDiskObject;

public:
DiskObjectScope(const std::string &diskObjectName);
DiskObjectScope(const std::string &diskObjectName, bool exceptionOnError = true);
~DiskObjectScope();

std::string FindToolTypeAsString(const std::string &toolTypeName);
bool FindToolTypeAsBool(const std::string &toolTypeName);

protected:
// may be nullptr if exceptionOnError = false and GetDiskObject() failed
struct DiskObject *diskObject() const
{
return mpDiskObject;
Expand Down
61 changes: 61 additions & 0 deletions wrappers/src/AOS/TagUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,67 @@ namespace AOS
MAP_PAIR(MUIA_Text_Shortened, ValueType::Bool),
#endif


/*
// TextEditor
MAP_PAIR(MUIA_TextEditor_Contents, ValueType::),
MAP_PAIR(MUIA_TextEditor_CursorX, ValueType::),
MAP_PAIR(MUIA_TextEditor_CursorY, ValueType::),
MAP_PAIR(MUIA_TextEditor_DoubleClickHook, ValueType::),
MAP_PAIR(MUIA_TextEditor_TypeAndSpell, ValueType::),
MAP_PAIR(MUIA_TextEditor_ExportHook, ValueType::),
MAP_PAIR(MUIA_TextEditor_ExportWrap, ValueType::),
MAP_PAIR(MUIA_TextEditor_FixedFont, ValueType::),
MAP_PAIR(MUIA_TextEditor_Flow, ValueType::),
MAP_PAIR(MUIA_TextEditor_HasChanged, ValueType::),
MAP_PAIR(MUIA_TextEditor_Prop_DeltaFactor, ValueType::),
MAP_PAIR(MUIA_TextEditor_ImportHook, ValueType::),
MAP_PAIR(MUIA_TextEditor_InsertMode, ValueType::),
MAP_PAIR(MUIA_TextEditor_ImportWrap, ValueType::),
MAP_PAIR(MUIA_TextEditor_KeyBindings, ValueType::),
MAP_PAIR(MUIA_TextEditor_UndoAvailable, ValueType::),
MAP_PAIR(MUIA_TextEditor_RedoAvailable, ValueType::),
MAP_PAIR(MUIA_TextEditor_AreaMarked, ValueType::),
MAP_PAIR(MUIA_TextEditor_Prop_Entries, ValueType::),
MAP_PAIR(MUIA_TextEditor_Prop_Visible, ValueType::),
MAP_PAIR(MUIA_TextEditor_Quiet, ValueType::),
MAP_PAIR(MUIA_TextEditor_NumLock, ValueType::),
MAP_PAIR(MUIA_TextEditor_ReadOnly, ValueType::),
MAP_PAIR(MUIA_TextEditor_Slider, ValueType::),
MAP_PAIR(MUIA_TextEditor_InVirtualGroup, ValueType::),
MAP_PAIR(MUIA_TextEditor_StyleBold, ValueType::),
MAP_PAIR(MUIA_TextEditor_StyleItalic, ValueType::),
MAP_PAIR(MUIA_TextEditor_StyleUnderline, ValueType::),
MAP_PAIR(MUIA_TextEditor_Prop_First, ValueType::),
MAP_PAIR(MUIA_TextEditor_WrapBorder, ValueType::),
MAP_PAIR(MUIA_TextEditor_Separator, ValueType::),
MAP_PAIR(MUIA_TextEditor_Pen, ValueType::),
MAP_PAIR(MUIA_TextEditor_ColorMap, ValueType::),
MAP_PAIR(MUIA_TextEditor_MultiColorQuoting, ValueType::),
MAP_PAIR(MUIA_TextEditor_Rows, ValueType::),
MAP_PAIR(MUIA_TextEditor_Columns, ValueType::),
MAP_PAIR(MUIA_TextEditor_AutoClip, ValueType::),
MAP_PAIR(MUIA_TextEditor_CursorPosition, ValueType::),
MAP_PAIR(MUIA_TextEditor_KeyUpFocus, ValueType::),
MAP_PAIR(MUIA_TextEditor_UndoLevels, ValueType::),
MAP_PAIR(MUIA_TextEditor_WrapMode, ValueType::),
MAP_PAIR(MUIA_TextEditor_ActiveObjectOnClick, ValueType::),
MAP_PAIR(MUIA_TextEditor_PasteStyles, ValueType::),
MAP_PAIR(MUIA_TextEditor_PasteColors, ValueType::),
MAP_PAIR(MUIA_TextEditor_ConvertTabs, ValueType::),
MAP_PAIR(MUIA_TextEditor_WrapWords, ValueType::),
MAP_PAIR(MUIA_TextEditor_TabSize, ValueType::),
MAP_PAIR(MUIA_TextEditor_Keywords, ValueType::),
MAP_PAIR(MUIA_TextEditor_MatchedKeyword, ValueType::),
MAP_PAIR(MUIA_TextEditor_CursorIndex, ValueType::),
MAP_PAIR(MUIA_TextEditor_RGBMode, ValueType::),
MAP_PAIR(MUIA_TextEditor_HorizontalSlider, ValueType::),
MAP_PAIR(MUIA_TextEditor_GlobalFlow, ValueType::),
MAP_PAIR(MUIA_TextEditor_ContentsChanged, ValueType::),
MAP_PAIR(MUIA_TextEditor_MetaDataChanged, ValueType::),
MAP_PAIR(MUIA_TextEditor_InactiveContents, ValueType::),
*/

// ASL
MAP_PAIR(ASLFR_TextAttr, ValueType::Pointer),
MAP_PAIR(ASLFR_Locale, ValueType::Pointer),
Expand Down
6 changes: 6 additions & 0 deletions wrappers/src/Core/ToString.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
#include <string>
#include <vector>

#ifdef STD_LIGHT
#ifdef Format
#undef Format
#endif
#endif // STD_LIGHT

class ToString
{
public:
Expand Down
27 changes: 27 additions & 0 deletions wrappers/src/Core/ToString.tmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// template <typename T0> inline std::string ToString::Format(std::string format, const T0 &arg0)
// {
// try
// {
// if (std::is_same<T0, std::string>::value)
// {
// return format.replace(format.find("{}"), 2, arg0);
// }
// else if (std::is_same<T0, std::vector<std::string>>::value)
// {
// return format.replace(format.find("{}"), 2, Concatenate(arg0));
// }
// else
// {
// auto error = std::string { __PRETTY_FUNCTION__ } + ", unsupported arg0 type!";
// throw std::runtime_error(error);
// }
// }
// catch (...)
// {
// std::cerr << "exception on std::format(arg0)=" << format << std::endl;
// return format;
// }
// }

// template <typename T0>
// static std::string Format(std::string format, const T0 &arg0);
Empty file.
Loading
Loading