dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Use std::string in the driver and blitter selection code.

Browse Source
This commit is contained in:
Michael Lutz
2020-05-17 23:32:08 +02:00
parent a49fdb7ebb
commit 37bc2f8064
51 changed files with 126 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/driver.cpp
View File

@@ -13,19 +13,21 @@
#include "music/music_driver.hpp"
#include "video/video_driver.hpp"
#include "string_func.h"
#include <string>
#include <sstream>
#include "safeguards.h"
char *_ini_videodriver; ///< The video driver a stored in the configuration file.
std::string _ini_videodriver; ///< The video driver a stored in the configuration file.
std::vector<Dimension> _resolutions; ///< List of resolutions.
Dimension _cur_resolution; ///< The current resolution.
bool _rightclick_emulate; ///< Whether right clicking is emulated.
char *_ini_sounddriver; ///< The sound driver a stored in the configuration file.
std::string _ini_sounddriver; ///< The sound driver a stored in the configuration file.
char *_ini_musicdriver; ///< The music driver a stored in the configuration file.
std::string _ini_musicdriver; ///< The music driver a stored in the configuration file.
char *_ini_blitter; ///< The blitter as stored in the configuration file.
std::string _ini_blitter; ///< The blitter as stored in the configuration file.
bool _blitter_autodetected; ///< Was the blitter autodetected or specified by the user?
/**
@@ -34,19 +36,15 @@ bool _blitter_autodetected; ///< Was the blitter autodetected or specif
* @param name The parameter name we're looking for.
* @return The parameter value.
*/
const char *GetDriverParam(const char * const *parm, const char *name)
const char *GetDriverParam(const StringList &parm, const char *name)
{
size_t len;
if (parm.empty()) return nullptr;
if (parm == nullptr) return nullptr;
len = strlen(name);
for (; *parm != nullptr; parm++) {
const char *p = *parm;
if (strncmp(p, name, len) == 0) {
if (p[len] == '=') return p + len + 1;
if (p[len] == '\0') return p + len;
size_t len = strlen(name);
for (auto &p : parm) {
if (p.compare(0, len, name) == 0) {
if (p.length() == len) return "";
if (p[len] == '=') return p.c_str() + len + 1;
}
}
return nullptr;
@@ -58,7 +56,7 @@ const char *GetDriverParam(const char * const *parm, const char *name)
* @param name The parameter name we're looking for.
* @return The parameter value.
*/
bool GetDriverParamBool(const char * const *parm, const char *name)
bool GetDriverParamBool(const StringList &parm, const char *name)
{
return GetDriverParam(parm, name) != nullptr;
}
@@ -70,7 +68,7 @@ bool GetDriverParamBool(const char * const *parm, const char *name)
* @param def The default value if the parameter doesn't exist.
* @return The parameter value.
*/
int GetDriverParamInt(const char * const *parm, const char *name, int def)
int GetDriverParamInt(const StringList &parm, const char *name, int def)
{
const char *p = GetDriverParam(parm, name);
return p != nullptr ? atoi(p) : def;
@@ -82,12 +80,12 @@ int GetDriverParamInt(const char * const *parm, const char *name, int def)
* @param type the type of driver to select
* @post Sets the driver so GetCurrentDriver() returns it too.
*/
void DriverFactoryBase::SelectDriver(const char *name, Driver::Type type)
void DriverFactoryBase::SelectDriver(const std::string &name, Driver::Type type)
{
if (!DriverFactoryBase::SelectDriverImpl(name, type)) {
StrEmpty(name) ?
name.empty() ?
usererror("Failed to autoprobe %s driver", GetDriverTypeName(type)) :
usererror("Failed to select requested %s driver '%s'", GetDriverTypeName(type), name);
usererror("Failed to select requested %s driver '%s'", GetDriverTypeName(type), name.c_str());
}
}
@@ -98,11 +96,11 @@ void DriverFactoryBase::SelectDriver(const char *name, Driver::Type type)
* @post Sets the driver so GetCurrentDriver() returns it too.
* @return True upon success, otherwise false.
*/
bool DriverFactoryBase::SelectDriverImpl(const char *name, Driver::Type type)
bool DriverFactoryBase::SelectDriverImpl(const std::string &name, Driver::Type type)
{
if (GetDrivers().size() == 0) return false;
if (StrEmpty(name)) {
if (name.empty()) {
/* Probe for this driver, but do not fall back to dedicated/null! */
for (int priority = 10; priority > 0; priority--) {
Drivers::iterator it = GetDrivers().begin();
@@ -117,7 +115,7 @@ bool DriverFactoryBase::SelectDriverImpl(const char *name, Driver::Type type)
Driver *newd = d->CreateInstance();
*GetActiveDriver(type) = newd;
const char *err = newd->Start(nullptr);
const char *err = newd->Start({});
if (err == nullptr) {
DEBUG(driver, 1, "Successfully probed %s driver '%s'", GetDriverTypeName(type), d->name);
delete oldd;
@@ -131,23 +129,15 @@ bool DriverFactoryBase::SelectDriverImpl(const char *name, Driver::Type type)
}
usererror("Couldn't find any suitable %s driver", GetDriverTypeName(type));
} else {
char *parm;
char buffer[256];
const char *parms[32];
/* Extract the driver name and put parameter list in parm */
strecpy(buffer, name, lastof(buffer));
parm = strchr(buffer, ':');
parms[0] = nullptr;
if (parm != nullptr) {
uint np = 0;
/* Tokenize the parm. */
do {
*parm++ = '\0';
if (np < lengthof(parms) - 1) parms[np++] = parm;
while (*parm != '\0' && *parm != ',') parm++;
} while (*parm == ',');
parms[np] = nullptr;
std::istringstream buffer(name);
std::string dname;
std::getline(buffer, dname, ':');
std::string param;
std::vector<std::string> parms;
while (std::getline(buffer, param, ',')) {
parms.push_back(param);
}
/* Find this driver */
@@ -159,7 +149,7 @@ bool DriverFactoryBase::SelectDriverImpl(const char *name, Driver::Type type)
if (d->type != type) continue;
/* Check driver name */
if (strcasecmp(buffer, d->name) != 0) continue;
if (strcasecmp(dname.c_str(), d->name) != 0) continue;
/* Found our driver, let's try it */
Driver *newd = d->CreateInstance();
@@ -175,7 +165,7 @@ bool DriverFactoryBase::SelectDriverImpl(const char *name, Driver::Type type)
*GetActiveDriver(type) = newd;
return true;
}
usererror("No such %s driver: %s\n", GetDriverTypeName(type), buffer);
usererror("No such %s driver: %s\n", GetDriverTypeName(type), dname.c_str());
}
}
@@ -221,9 +211,7 @@ DriverFactoryBase::DriverFactoryBase(Driver::Type type, int priority, const char
strecpy(buf, GetDriverTypeName(type), lastof(buf));
strecpy(buf + 5, name, lastof(buf));
const char *longname = stredup(buf);
std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(longname, this));
std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(buf, this));
assert(P.second);
}
@@ -240,10 +228,6 @@ DriverFactoryBase::~DriverFactoryBase()
Drivers::iterator it = GetDrivers().find(buf);
assert(it != GetDrivers().end());
const char *longname = (*it).first;
GetDrivers().erase(it);
free(longname);
if (GetDrivers().empty()) delete &GetDrivers();
}