Compare commits

...

2 Commits

Author SHA1 Message Date
Ruben d2724f2417
Removed a check for vim that didn't work 2022-12-30 07:52:03 +01:00
Ruben 471d83718f
Started work on the SDL prototype 2022-12-30 07:51:32 +01:00
3 changed files with 325 additions and 208 deletions

View File

@ -14,11 +14,6 @@ execute_process(
OUTPUT_VARIABLE GIT_COMMIT_MSG OUTPUT_VARIABLE GIT_COMMIT_MSG
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
# Hacky way to get environment variables
execute_process(
COMMAND bash -c "echo $VIM"
OUTPUT_VARIABLE ISVIM
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
@ -33,5 +28,3 @@ string(REPLACE "\n" "\\n" GIT_COMMIT_MSG "${GIT_COMMIT_MSG}")
target_compile_definitions(${PROJECT_NAME} PRIVATE target_compile_definitions(${PROJECT_NAME} PRIVATE
"-DGIT_COMMIT_MSG=\"${GIT_COMMIT_MSG}\"") "-DGIT_COMMIT_MSG=\"${GIT_COMMIT_MSG}\"")
target_compile_definitions(${PROJECT_NAME} PRIVATE "-DISVIM=${ISVIM}")

View File

@ -3,19 +3,24 @@
int usage() { int usage() {
std::cout << "Usage:"; std::cout << "Usage:";
std::cout << "\n\t"; std::cout << "\n\t";
std::cout << GET_PROGRAM_NAME() << " [" << cyan("command") << "] <" << bright_green("options") << ">\n"; std::cout << GET_PROGRAM_NAME() << " [" << cyan("command") << "] <"
<< bright_green("options") << ">\n";
std::cout << "\n"; std::cout << "\n";
std::cout << "Run `" << GET_PROGRAM_NAME() << bright_green(" --help") << "' for more information.\n" << std::endl; std::cout << "Run `" << GET_PROGRAM_NAME() << bright_green(" --help")
<< "' for more information.\n"
<< std::endl;
return 1; return 1;
} }
int show_help() { int show_help() {
std::cout << GET_PROGRAM_NAME() << " [" << cyan("command") << "] <" << bright_green("options") << ">\n"; std::cout << GET_PROGRAM_NAME() << " [" << cyan("command") << "] <"
<< bright_green("options") << ">\n";
std::cout << "\n"; std::cout << "\n";
std::cout << "Usage:"; std::cout << "Usage:";
// ceev init // ceev init
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << cyan(" init ") << "<" << bright_green("--force") << ">\n"; std::cout << GET_PROGRAM_NAME() << cyan(" init ") << "<"
<< bright_green("--force") << ">\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "Creates the CeeV file system. Can only be used "; std::cout << "Creates the CeeV file system. Can only be used ";
std::cout << "if the current folder is empty,"; std::cout << "if the current folder is empty,";
@ -37,17 +42,20 @@ int show_help() {
std::cout << "Not yet implemented"; std::cout << "Not yet implemented";
// ceev devel // ceev devel
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << cyan(" devel ") << "<" << bright_green("--help") << ">\n"; std::cout << GET_PROGRAM_NAME() << cyan(" devel ") << "<"
<< bright_green("--help") << ">\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "Supplementary command for development information"; std::cout << "Supplementary command for development information";
// ceev --help // ceev --help
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << cyan(" --help") << "/" << cyan("-h") << "\n"; std::cout << GET_PROGRAM_NAME() << cyan(" --help") << "/" << cyan("-h")
<< "\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "This help page."; std::cout << "This help page.";
// ceev --version // ceev --version
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << cyan(" --version") << "/" << cyan("-v") << "\n"; std::cout << GET_PROGRAM_NAME() << cyan(" --version") << "/" << cyan("-v")
<< "\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "Get the current version."; std::cout << "Get the current version.";
std::cout << std::endl; std::cout << std::endl;
@ -74,28 +82,64 @@ static std::string query_author() {
return author; return author;
} }
struct config_data get_config() {
fs::path config_path = fs::current_path();
std::string line;
struct config_data data;
std::ifstream config(config_path / ".ceev" / CONFIG_FILENAME);
if (!config) {
std::cerr << bg_red(bold("ERROR")) << ": Could not open config\n";
std::cerr << "Run `ceev init' to create a new project." << std::endl;
return data;
}
while (std::getline(config, line)) {
std::istringstream iss(line);
std::string key;
if (!std::getline(iss, key, '='))
continue;
std::string value;
if (!std::getline(iss, value))
continue;
if (key == "name")
data.name = value;
if (key == "version")
data.version = value;
if (key == "author")
data.author = value;
if (key == "email")
data.email = value;
}
config.close();
return data;
}
int create_fs(std::deque<std::string> args) { int create_fs(std::deque<std::string> args) {
fs::path cwd = fs::current_path(); fs::path cwd = fs::current_path();
if (!fs::is_empty(cwd) && ((!args.empty() && args[0] != "--force") || args.empty())) { if (!fs::is_empty(cwd) &&
std::cerr << bg_red(bold("ERROR")) << ": Folder not empty.\n" << ((!args.empty() && args[0] != "--force") || args.empty())) {
"Run the command with `--force' to run anyways" << std::endl; std::cerr << bg_red(bold("ERROR")) << ": Folder not empty.\n"
<< "Run the command with `--force' to run anyways" << std::endl;
return 1; return 1;
} }
fs::create_directory(cwd.string() + "/.ceev", cwd); fs::create_directory(cwd / ".ceev", cwd);
fs::create_directory(cwd.string() + "/src", cwd); fs::create_directory(cwd / "src", cwd);
std::ofstream config(cwd.string() + "/.ceev/" + CONFIG_FILENAME); std::ofstream config(cwd / ".ceev/" / CONFIG_FILENAME);
std::string directory = cwd.string().substr(cwd.parent_path().string().length() + 1); std::string directory =
cwd.string().substr(cwd.parent_path().string().length() + 1);
std::cout << "Initializing project...\n"; std::cout << "Initializing project...\n";
std::cout << "You can change this information later by editing .ceev/" << CONFIG_FILENAME << "\n"; std::cout << "You can change this information later by editing .ceev/"
<< CONFIG_FILENAME << "\n";
std::string project_name; std::string project_name;
std::cout << "Project name [" << directory << "]: "; std::cout << "Project name [" << directory << "]: ";
std::getline(std::cin, project_name); std::getline(std::cin, project_name);
if (project_name == "") project_name = directory; if (project_name == "")
project_name = directory;
config << "name=" << project_name << '\n'; config << "name=" << project_name << '\n';
std::string version; std::string version;
std::cout << "Version [0.0.1]: "; std::cout << "Version [0.0.1]: ";
std::getline(std::cin, version); std::getline(std::cin, version);
if (version == "") version = "0.0.1"; if (version == "")
version = "0.0.1";
config << "version=" << version << '\n'; config << "version=" << version << '\n';
std::string author = query_author(); std::string author = query_author();
if (author == "") { if (author == "") {
@ -108,7 +152,8 @@ int create_fs(std::deque<std::string> args) {
replace(author, " ", "."); replace(author, " ", ".");
std::cout << "Email [" << author << "@example.org]: "; std::cout << "Email [" << author << "@example.org]: ";
std::getline(std::cin, email); std::getline(std::cin, email);
if (email == "") email = author + "@example.org"; if (email == "")
email = author + "@example.org";
config << "email=" << email << '\n'; config << "email=" << email << '\n';
config.close(); config.close();
return 0; return 0;
@ -118,26 +163,7 @@ int build_project(std::deque<std::string> args) {
return 0; return 0;
} }
int run_project(std::deque<std::string> args) { int run_project(std::deque<std::string> args) {
std::ifstream config(".ceev/config"); struct config_data data = get_config();
if (!config) {
std::cerr << bg_red(bold("ERROR")) << ": Could not open config\n";
std::cerr << "Run `ceev init' to create a new project." << std::endl;
return 1;
}
std::string line;
struct config_data data;
while (std::getline(config, line)) {
std::istringstream iss(line);
std::string key;
if (!std::getline(iss, key, '=')) continue;
std::string value;
if (!std::getline(iss, value)) continue;
if (key == "name") data.name = value;
if (key == "version") data.version = value;
if (key == "author") data.author = value;
if (key == "email") data.email = value;
}
config.close();
std::cout << "Name: " << data.name << '\n'; std::cout << "Name: " << data.name << '\n';
std::cout << "Version: " << data.version << '\n'; std::cout << "Version: " << data.version << '\n';
std::cout << "Author: " << data.author << '\n'; std::cout << "Author: " << data.author << '\n';
@ -151,43 +177,61 @@ int clean_project(std::deque<std::string> args) {
} }
int devel(std::deque<std::string> args) { int devel(std::deque<std::string> args) {
if (args.empty()) { if (args.empty()) {
std::cout << bg_red(bold("ERROR")) << ": No subcommands given." << std::endl; std::cout << bg_red(bold("ERROR")) << ": No subcommands given."
<< std::endl;
devel_help(); devel_help();
return 1; return 1;
} }
std::string a1 = args[0]; std::string a1 = args[0];
args.pop_front(); args.pop_front();
if (a1 == "commitinfo") return devel_commitinfo(); if (a1 == "commitinfo")
return devel_commitinfo();
if (a1 == "roadmap")
return devel_roadmap();
if (a1 == "sdl2")
return devel_sdl2(args);
std::string kw; std::string kw;
if (a1.substr(0, 2) == "--") { if (a1.substr(0, 2) == "--") {
kw = a1.substr(2); kw = a1.substr(2);
if (kw == "help") return devel_help(); if (kw == "help")
return devel_help();
} }
if (a1.substr(0, 1) == "-") { if (a1.substr(0, 1) == "-") {
kw = a1.substr(1); kw = a1.substr(1);
if (kw == "h") return devel_help(); if (kw == "h")
return devel_help();
} }
std::cerr << bg_red(bold("ERROR")) << ": Unknown command `" << bright_magenta(a1) << "'\n" << std::endl; std::cerr << bg_red(bold("ERROR")) << ": Unknown command `"
<< bright_magenta(a1) << "'\n"
<< std::endl;
devel_help(); devel_help();
return 1; return 1;
} }
int devel_help() { int devel_help() {
std::cout << "Usage:\n"; std::cout << "Usage:";
// ceev devel roadmap // ceev devel roadmap
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << " devel " << cyan("roadmap") << "\n"; std::cout << GET_PROGRAM_NAME() << " devel " << cyan("roadmap") << "\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "Get the current roadmap.\n"; std::cout << "Get the current roadmap.";
// ceev devel commitinfo // ceev devel commitinfo
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << " devel " << cyan("commitinfo") << "\n"; std::cout << GET_PROGRAM_NAME() << " devel " << cyan("commitinfo") << "\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "Get info about the latest commit.\n"; std::cout << "Get info about the latest commit.";
// ceev devel sdl2
std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << " devel " << cyan("sdl2") << "\n";
std::cout << "\t\t";
std::cout << "Tests of SDL2";
// ceev devel --help // ceev devel --help
std::cout << "\n*\t"; std::cout << "\n*\t";
std::cout << GET_PROGRAM_NAME() << " devel " << cyan("--help") << "/" << cyan("-h") << "\n"; std::cout << GET_PROGRAM_NAME() << " devel " << cyan("--help") << "/"
<< cyan("-h") << "\n";
std::cout << "\t\t"; std::cout << "\t\t";
std::cout << "This help page.\n"; std::cout << "This help page.";
std::cout << std::endl;
return 0; return 0;
} }
int devel_commitinfo() { int devel_commitinfo() {
@ -196,36 +240,111 @@ int devel_commitinfo() {
std::cout << bright_cyan(bold(GIT_COMMIT_MSG)) << std::endl; std::cout << bright_cyan(bold(GIT_COMMIT_MSG)) << std::endl;
return 0; return 0;
} }
int devel_roadmap() {
std::cout << "CeeV roadmap:\n";
std::cout << "*" << bg_bright_green("INPROG")
<< ":\tGet a working SDL prototype.\n";
std::cout << "*" << bg_yellow(green("TODO"))
<< " :\tMake a language parser.\n";
std::cout << "*" << bg_yellow(green("TODO"))
<< " :\tMake a language compiler.\n";
std::cout << "*" << bg_yellow(green("TODO")) << " :\tTest the language.\n";
std::cout << "*" << bg_green(bold("STATUS")) << ": ";
std::cout << "SDL is currently blocking, the rest depends on SDL to be in a "
"prototype stage, at least."
<< std::endl;
return 0;
}
int devel_sdl2(std::deque<std::string> args) {
struct config_data data = get_config();
if (data.name == "" &&
(args.empty() || args[0] != "--use-defaults" || args[0] != "-D")) {
return 1;
}
const int SCREEN_WIDTH = 640;
const int SCREEN_HEIGHT = 480;
SDL_Window *window = nullptr;
SDL_Surface *screen_surface = nullptr;
SDL_Surface *img_surface = nullptr;
return 0;
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
std::cerr << bg_red(bold("ERROR"))
<< ": SDL could not initialize! SDL_Error: " << SDL_GetError()
<< std::endl;
return 1;
}
window = SDL_CreateWindow(data.name.c_str(), SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, SCREEN_WIDTH,
SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
if (window == nullptr) {
std::cerr << bg_red(bold("ERROR"))
<< ": Window could not be created! SDL_Error: " << SDL_GetError()
<< std::endl;
return 1;
}
screen_surface = SDL_GetWindowSurface(window);
SDL_FillRect(screen_surface, nullptr,
SDL_MapRGB(screen_surface->format, 0xFF, 0xFF, 0xFF));
screen_surface = SDL_GetWindowSurface(window);
SDL_FillRect(screen_surface, nullptr,
SDL_MapRGB(screen_surface->format, 0xFF, 0xFF, 0xFF));
SDL_UpdateWindowSurface(window);
// hack to make it stay open
SDL_Event e;
bool quit = false;
while (!quit) {
while (SDL_PollEvent(&e) != 0) {
if (e.type == SDL_QUIT) {
quit = true;
}
}
}
SDL_DestroyWindow(window);
SDL_Quit();
return 0;
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
if (argc <= 1) { if (argc <= 1) {
return usage(); return usage();
} }
std::deque<std::string> args; std::deque<std::string> args;
for (int i = 1; i < argc; i++) args.push_back(std::string(argv[i])); for (int i = 1; i < argc; i++)
args.push_back(std::string(argv[i]));
std::string a1 = std::string(args[0]); std::string a1 = std::string(args[0]);
// XXX: Is this really needed? // XXX: Is this really needed?
std::transform(a1.begin(), a1.end(), a1.begin(), [](unsigned char c){return std::tolower(c);}); std::transform(a1.begin(), a1.end(), a1.begin(),
[](unsigned char c) { return std::tolower(c); });
args.pop_front(); args.pop_front();
if (a1 == "init") { if (a1 == "init") {
return create_fs(args); return create_fs(args);
} }
if (a1 == "build") return build_project(args); if (a1 == "build")
if (a1 == "run") return run_project(args); return build_project(args);
if (a1 == "clean") return clean_project(args); if (a1 == "run")
if (a1 == "devel") return devel(args); return run_project(args);
if (a1 == "clean")
return clean_project(args);
if (a1 == "devel")
return devel(args);
std::string kw; std::string kw;
if (a1.substr(0, 2) == "--") { if (a1.substr(0, 2) == "--") {
kw = a1.substr(2); kw = a1.substr(2);
if (kw == "version") return show_version(); if (kw == "version")
if (kw == "help") return show_help(); return show_version();
if (kw == "help")
return show_help();
} }
if (a1.substr(0, 1) == "-") { if (a1.substr(0, 1) == "-") {
// TODO: Although not yet needed, add support for multiparams, like `ceev -hv' // TODO: Although not yet needed, add support for multiparams, like `ceev
// True, that doesn't make sense, that's why it's not yet needed. // -hv' True, that doesn't make sense, that's why it's not yet needed.
kw = a1.substr(1); kw = a1.substr(1);
if (kw == "v") return show_version(); if (kw == "v")
if (kw == "h") return show_help(); return show_version();
if (kw == "h")
return show_help();
} }
std::cerr << bg_red(bold("ERROR")) << ": Unknown command `" << bright_magenta(a1) << "'\n" << std::endl; std::cerr << bg_red(bold("ERROR")) << ": Unknown command `"
<< bright_magenta(a1) << "'\n"
<< std::endl;
return usage(); return usage();
} }

View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <SDL2/SDL.h>
#include <algorithm> #include <algorithm>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
@ -9,6 +10,8 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include "colors.h"
#ifndef __ceev_version #ifndef __ceev_version
#define __ceev_version "0.1.1-devel" #define __ceev_version "0.1.1-devel"
#endif #endif
@ -52,4 +55,6 @@ int clean_project(std::deque<std::string> args);
int devel(std::deque<std::string> args); int devel(std::deque<std::string> args);
int devel_help(); int devel_help();
int devel_commitinfo(); int devel_commitinfo();
int devel_roadmap();
int devel_sdl2(std::deque<std::string> args);
int main(int argc, char **argv); int main(int argc, char **argv);