nishi/nishbox
1
Fork 0
mirror of https://github.com/nishiowo/nishbox synced 2025-04-21 20:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

add fs layer

Browse Source
This commit is contained in:
NishiOwO 2025-04-21 21:32:27 +09:00
parent 8413734a6e
commit d8555172a4
No known key found for this signature in database
GPG Key ID: 27EF69B208EB9343
11 changed files with 188 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
engine/include/gf_file.h
View File

@ -14,7 +14,46 @@
#include <gf_type/file.h>
/* Engine */
#include <gf_type/core.h>
/* Standard */
#include <stddef.h>
/**
* @~english
* @brief Open file
* @param engine Engine instance
* @param path Path
* @param mode Mode
* @return File
*/
GF_EXPORT gf_file_t* gf_file_open(gf_engine_t* engine, const char* path, const char* mode);
/**
* @~english
* @brief Read file
* @param fp File
* @param buffer Buffer
* @param size Size
* @return Read size
*/
GF_EXPORT size_t gf_file_read(gf_file_t* fp, void* buffer, size_t size);
/**
* @~english
* @brief Write to file
* @param fp File
* @param buffer Buffer
* @param size Size
* @return Written size
*/
GF_EXPORT size_t gf_file_write(gf_file_t* fp, void* buffer, size_t size);
/**
* @~english
* @brief Close file
* @param fp File
*/
GF_EXPORT void gf_file_close(gf_file_t* fp);
#endif

13
engine/include/gf_macro.h
View File

@ -137,6 +137,15 @@
#define GF_EXPOSE_RESOURCE
#endif
#ifndef GF_EXPOSE_FILE
/**
* @~english
* @brief Expose file I/O properties
* @note Exposed by default
*/
#define GF_EXPOSE_FILE
#endif
#ifndef GF_EXPOSE_GRAPHIC
/**
* @~english
@ -211,4 +220,8 @@
#define GF_EXPOSE_VERSION
#endif
#ifndef GF_EXPOSE_FILE
#define GF_EXPOSE_FILE
#endif
#endif

13
engine/include/gf_type/client.h
View File

@ -20,7 +20,6 @@ typedef struct gf_client_t gf_client_t;
#include <gf_type/draw.h>
#include <gf_type/input.h>
#include <gf_type/audio.h>
#include <gf_type/resource.h>
/* Standard */
@ -40,16 +39,12 @@ typedef struct gf_client_t gf_client_t;
*
* @var gf_client_t::audio
* @brief Audio interface
*
* @var gf_client_t::base
* @brief Base resource
*/
GF_DECLARE_TYPE(client, {
gf_engine_t* engine;
gf_draw_t* draw;
gf_input_t* input;
gf_audio_t* audio;
gf_resource_t* base;
gf_engine_t* engine;
gf_draw_t* draw;
gf_input_t* input;
gf_audio_t* audio;
});
#else
typedef void gf_client_t;

11
engine/include/gf_type/core.h
View File

@ -18,6 +18,7 @@ typedef struct gf_engine_t gf_engine_t;
/* Engine */
#include <gf_type/server.h>
#include <gf_type/client.h>
#include <gf_type/resource.h>
/* Standard */
#include <stdio.h>
@ -38,11 +39,15 @@ typedef struct gf_engine_t gf_engine_t;
* @note Default is `stderr`
* @warning This is `NULL` when logger is using graphical console
* @warning Destroying engien instance **does not** `fclose` this
*
* @var gf_engine_t::base
* @brief Base resource
*/
GF_DECLARE_TYPE(engine, {
gf_server_t* server;
gf_client_t* client;
FILE* log;
gf_server_t* server;
gf_client_t* client;
FILE* log;
gf_resource_t* base;
});
#else
typedef void gf_engine_t;

23
engine/include/gf_type/file.h
View File

@ -18,15 +18,34 @@ typedef struct gf_file_t gf_file_t;
/* Engine */
/* Standard */
#include <stddef.h>
#include <stdio.h>
/**
* @struct gf_file_t
* @~english
* @brief File
*
* @var gf_file_t::fp
* @brief File pointer
*
* @var gf_file_t::buffer
* @brief Buffer
*
* @var gf_file_t::pos
* @brief File position
*
* @var gf_file_t::size
* @brief File size
*/
GF_DECLARE_TYPE(file, {});
GF_DECLARE_TYPE(file, {
FILE* fp;
void* buffer;
size_t pos;
size_t size;
});
#else
typedef void gf_file_t;
#error "should not happen!"
#endif
#endif

17
engine/src/gf_audio.c
View File

@ -13,6 +13,7 @@
/* Engine */
#include <gf_log.h>
#include <gf_file.h>
/* Standard */
#include <stdlib.h>
@ -171,22 +172,18 @@ gf_audio_id_t gf_audio_load(gf_audio_t* audio, const void* data, size_t size) {
}
gf_audio_id_t gf_audio_load_file(gf_audio_t* audio, const char* path) {
FILE* f = fopen(path, "rb");
size_t sz;
unsigned char* data;
gf_file_t* f = gf_file_open(audio->engine, path, "r");
gf_audio_id_t st;
unsigned char* data;
if(f == NULL) return -1;
fseek(f, 0, SEEK_END);
sz = ftell(f);
fseek(f, 0, SEEK_SET);
data = malloc(sz);
fread(data, sz, 1, f);
st = gf_audio_load(audio, data, sz);
data = malloc(f->size);
gf_file_read(f, data, f->size);
st = gf_audio_load(audio, data, f->size);
free(data);
fclose(f);
gf_file_close(f);
return st;
}

7
engine/src/gf_client.c
View File

@ -14,7 +14,6 @@
#include <gf_input.h>
#include <gf_audio.h>
#include <gf_font.h>
#include <gf_resource.h>
/* Standard */
#include <stdlib.h>
@ -45,10 +44,6 @@ gf_client_t* gf_client_create(gf_engine_t* engine, const char* title) {
client->input = gf_input_create(engine);
gf_draw_set_input(client->draw, client->input);
client->base = gf_resource_create(engine, "base.pak");
client->draw->font = gf_font_create_file(client->draw, "base:font/default.bdf");
return client;
}
@ -56,8 +51,6 @@ void gf_client_destroy(gf_client_t* client) {
if(client->draw != NULL) gf_draw_destroy(client->draw);
if(client->audio != NULL) gf_audio_destroy(client->audio);
if(client->input != NULL) gf_input_destroy(client->input);
if(client->base != NULL) gf_resource_destroy(client->base);
gf_log_function(client->engine, "Destroyed client interface", "");
free(client);
}

10
engine/src/gf_core.c
View File

@ -1,4 +1,6 @@
#define GF_EXPOSE_CORE
#define GF_EXPOSE_DRAW
#define GF_EXPOSE_CLIENT
#include <gf_pre.h>
@ -15,6 +17,8 @@
#include <gf_server.h>
#include <gf_log.h>
#include <gf_version.h>
#include <gf_resource.h>
#include <gf_font.h>
/* Standard */
#include <stdlib.h>
@ -66,6 +70,11 @@ gf_engine_t* gf_engine_create(const char* title, int nogui) {
gf_log_function(engine, "Switching to graphical console", "");
}
engine->server = gf_server_create(engine);
engine->base = gf_resource_create(engine, "base.pak");
if(!nogui) {
engine->client->draw->font = gf_font_create_file(engine->client->draw, "base:/font/default.bdf");
}
return engine;
}
@ -94,6 +103,7 @@ void gf_engine_loop(gf_engine_t* engine) {
void gf_engine_destroy(gf_engine_t* engine) {
if(engine->server != NULL) gf_server_destroy(engine->server);
if(engine->client != NULL) gf_client_destroy(engine->client);
if(engine->base != NULL) gf_resource_destroy(engine->base);
free(engine);
gf_log_function(NULL, "Destroyed engine", "");
}

7
engine/src/gf_draw_common.c
View File

@ -1,4 +1,6 @@
#define GF_EXPOSE_DRAW
#define GF_EXPOSE_CORE
#define GF_EXPOSE_CLIENT
#include <gf_pre.h>
@ -17,7 +19,7 @@
#include <gf_graphic.h>
#include <gf_font.h>
#include <gf_gui.h>
#include <gf_resource.h>
#include <gf_audio.h>
/* Standard */
#include <stdlib.h>
@ -91,6 +93,7 @@ void gf_draw_frame(gf_draw_t* draw) {
color.r = color.g = color.b = color.a = 255;
if(made == 0) {
int i;
gf_audio_resume(draw->engine->client->audio, gf_audio_load_file(draw->engine->client->audio, "base:/music/mikke-shine.xm"));
made = 1;
for(i = 0; i < 5; i++) {
double p = 50;
@ -101,7 +104,7 @@ void gf_draw_frame(gf_draw_t* draw) {
p = (s + p) / 2 - (s / 2);
}
id = gf_gui_create_button(draw->gui, p, p, s, s, "");
id = gf_gui_create_button(draw->gui, p, p, s, s, "test");
if(i > 0) {
gf_gui_set_parent(draw->gui, id, id - 1);
}

67
engine/src/gf_file.c
View File

@ -1,4 +1,5 @@
#define GF_EXPOSE_FILE
#define GF_EXPOSE_CORE
#include <gf_pre.h>
@ -11,3 +12,69 @@
#include <gf_resource.h>
/* Standard */
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
gf_file_t* gf_file_open(gf_engine_t* engine, const char* path, const char* mode) {
gf_file_t* fp = malloc(sizeof(*fp));
memset(fp, 0, sizeof(*fp));
fp->size = 0;
fp->pos = 0;
fp->buffer = NULL;
fp->fp = NULL;
if(strlen(path) > 6 && memcmp(path, "base:/", 6) == 0) {
if(strcmp(mode, "r") == 0) {
if(gf_resource_get(engine->base, path + 6, &fp->buffer, &fp->size) != 0) {
free(fp);
return NULL;
}
} else {
free(fp);
return NULL;
}
} else {
if(strcmp(mode, "r") == 0) {
fp->fp = fopen(path, "rb");
fseek(fp->fp, 0, SEEK_END);
fp->size = ftell(fp->fp);
fseek(fp->fp, 0, SEEK_SET);
} else if(strcmp(mode, "w") == 0) {
fp->fp = fopen(path, "wb");
} else {
free(fp);
return NULL;
}
}
return fp;
}
size_t gf_file_read(gf_file_t* fp, void* buffer, size_t size) {
size_t sz = (fp->size - fp->pos) < size ? (fp->size - fp->pos) : size;
if(fp->fp != NULL) {
fread(buffer, sz, 1, fp->fp);
}
if(fp->buffer != NULL) {
memcpy(buffer, (unsigned char*)fp->buffer + fp->pos, sz);
}
fp->pos += sz;
return sz;
}
size_t gf_file_write(gf_file_t* fp, void* buffer, size_t size) {
size_t sz = size;
if(fp->fp != NULL) {
fwrite(buffer, sz, 1, fp->fp);
}
fp->pos += sz;
fp->size += sz;
return sz;
}
void gf_file_close(gf_file_t* fp) {
if(fp->fp != NULL) fclose(fp->fp);
if(fp->buffer != NULL) free(fp->buffer);
free(fp);
}

29
engine/src/gf_font.c
View File

@ -1,4 +1,5 @@
#define GF_EXPOSE_FONT
#define GF_EXPOSE_DRAW
#include <gf_pre.h>
@ -10,12 +11,12 @@
/* Engine */
#include <gf_log.h>
#include <gf_texture.h>
#include <gf_file.h>
/* Standard */
#include <sys/stat.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
gf_font_glyph_t* gf_font_get(gf_font_t* font, int code) {
int i;
@ -164,21 +165,19 @@ gf_font_t* gf_font_create(gf_draw_t* draw, const char* path, const void* data, s
}
gf_font_t* gf_font_create_file(gf_draw_t* draw, const char* path) {
FILE* f;
struct gf_stat s;
char* buf;
gf_font_t* font;
if(gf_stat(path, &s) != 0) {
return NULL;
}
gf_log_function(NULL, "%s: %lu bytes", path, (unsigned long)s.st_size);
buf = malloc(s.st_size + 1);
buf[s.st_size] = 0;
f = fopen(path, "r");
fread(buf, s.st_size, 1, f);
fclose(f);
char* buf;
gf_font_t* font;
gf_file_t* f = gf_file_open(draw->engine, path, "r");
if(f == NULL) return NULL;
font = gf_font_create(draw, path, buf, s.st_size);
gf_log_function(NULL, "%s: %lu bytes", path, (unsigned long)f->size);
buf = malloc(f->size + 1);
buf[f->size] = 0;
gf_file_read(f, buf, f->size);
gf_file_close(f);
font = gf_font_create(draw, path, buf, f->size);
free(buf);