joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 11:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

More GUI work

Browse Source
This commit is contained in:
Jonathan Campbell 2025-01-01 16:40:23 -08:00
parent 77fb12acc2
commit b3b05ce1f0
1 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/gui/sdl_gui.cpp
View File

@ -292,54 +292,23 @@ namespace WLGUI {
Point(const long _x,const long _y) : x(_x), y(_y) { }
};
template <class Obj> class ResourceList {
class ResourceList {
public:
HandleIndex ListAlloc = 0;
std::vector<Obj*> List;
std::vector<void*> List;
void *GetVoid(const HandleIndex i);
void SetVoid(const HandleIndex i,void *p);
size_t Size(void) const;
HandleIndex AllocateHandleIndex(void);
};
Obj *Get(const HandleIndex i) {
if (i < HandleIndex(List.size())) return List[i];
return NULL;
template <class T> class TypedResourceList : public ResourceList {
public:
T *Get(const HandleIndex i) {
return (T*)GetVoid(i);
}
void Set(const HandleIndex i,Obj *p) {
if (i < HandleIndex(List.size())) {
List[i] = p;
if (p == NULL) ListAlloc = i;
}
}
size_t Size(void) const {
return List.size();
}
HandleIndex AllocateHandleIndex(void) {
/* scan forward from ListAlloc */
const HandleIndex pListAlloc = ListAlloc;
while (ListAlloc < List.size()) {
const HandleIndex index = ListAlloc++;
if (List[index] == NULL) return index;
}
ListAlloc = 0; /* No opening, scan again but only up to where the first loop started scanning */
while (ListAlloc < List.size() && ListAlloc <= pListAlloc) {
const HandleIndex index = ListAlloc++;
if (List[index] == NULL) return index;
}
/* Well then, enlarge the list */
{
const size_t osz = List.size();
if (osz >= 1024u) return InvalidHandleIndex; /* but not too much! */
ListAlloc = HandleIndex(osz); /* neither of the first two found anything, scan from where we extend the list */
List.resize(osz + (osz / 4u) + 64u);
for (size_t i=osz;i < List.size();i++) List[i] = NULL;
}
/* one more time */
while (ListAlloc < List.size()) {
const HandleIndex index = ListAlloc++;
if (List[index] == NULL) return index;
}
return InvalidHandleIndex;
void Set(const HandleIndex i,T *p) {
SetVoid(i,(void*)p);
}
};
@ -351,7 +320,7 @@ namespace WLGUI {
namespace DC {
struct Obj;
ResourceList<Obj> List;
TypedResourceList<Obj> List;
enum class ObjType {
Base=0, /* you shouldn't use this */
@ -681,6 +650,54 @@ namespace WLGUI {
return r;
}
void *ResourceList::GetVoid(const HandleIndex i) {
if (i < HandleIndex(List.size())) return List[i];
return NULL;
}
void ResourceList::SetVoid(const HandleIndex i,void *p) {
if (i < HandleIndex(List.size())) {
List[i] = p;
if (p == NULL) ListAlloc = i;
}
}
size_t ResourceList::Size(void) const {
return List.size();
}
HandleIndex ResourceList::AllocateHandleIndex(void) {
/* scan forward from ListAlloc */
const HandleIndex pListAlloc = ListAlloc;
while (ListAlloc < List.size()) {
const HandleIndex index = ListAlloc++;
if (List[index] == NULL) return index;
}
ListAlloc = 0; /* No opening, scan again but only up to where the first loop started scanning */
while (ListAlloc < List.size() && ListAlloc <= pListAlloc) {
const HandleIndex index = ListAlloc++;
if (List[index] == NULL) return index;
}
/* Well then, enlarge the list */
{
const size_t osz = List.size();
if (osz >= 1024u) return InvalidHandleIndex; /* but not too much! */
ListAlloc = HandleIndex(osz); /* neither of the first two found anything, scan from where we extend the list */
List.resize(osz + (osz / 4u) + 64u);
for (size_t i=osz;i < List.size();i++) List[i] = NULL;
}
/* one more time */
while (ListAlloc < List.size()) {
const HandleIndex index = ListAlloc++;
if (List[index] == NULL) return index;
}
return InvalidHandleIndex;
}
}
void NewUIExperiment(bool pressed) {