Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store SDF fonts in shared memory regions

Browse Source
This commit is contained in:
K. Lange 2018-05-08 17:03:13 +09:00
parent b42bec5b70
commit d67021d7b8
2 changed files with 87 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
apps/compositor.c
View File

@ -1877,14 +1877,53 @@ int main(int argc, char * argv[]) {
TRACE("pex bound? %d", server);
yg->server = server;
#if 0
load_sprite_png(&yg->mouse_sprite, "/usr/share/cursor/normal.png");
load_sprite_png(&yg->mouse_sprite_drag, "/usr/share/cursor/drag.png");
load_sprite_png(&yg->mouse_sprite_resize_v, "/usr/share/cursor/resize-vertical.png");
load_sprite_png(&yg->mouse_sprite_resize_h, "/usr/share/cursor/resize-horizontal.png");
load_sprite_png(&yg->mouse_sprite_resize_da, "/usr/share/cursor/resize-uldr.png");
load_sprite_png(&yg->mouse_sprite_resize_db, "/usr/share/cursor/resize-dlur.png");
#endif
TRACE("Loading fonts...");
{
sprite_t _font_data[6];
load_sprite(&_font_data[0], "/usr/share/sdf_thin.bmp");
load_sprite(&_font_data[1], "/usr/share/sdf_bold.bmp");
load_sprite(&_font_data[2], "/usr/share/sdf_mono.bmp");
load_sprite(&_font_data[3], "/usr/share/sdf_mono_bold.bmp");
load_sprite(&_font_data[4], "/usr/share/sdf_mono_oblique.bmp");
load_sprite(&_font_data[5], "/usr/share/sdf_mono_bold_oblique.bmp");
TRACE(" Data loaded...");
size_t font_data_size = sizeof(unsigned int) * (1 + 6 * 3);
for (int i = 0; i < 6; ++i) {
font_data_size += 4 * _font_data[i].width * _font_data[i].height;
}
TRACE(" Size calculated: %d", font_data_size);
char tmp[100];
sprintf(tmp, "sys.%s.fonts", yg->server_ident);
size_t s = font_data_size;
char * font = (char *)syscall_shm_obtain(tmp, &s);
assert((s >= font_data_size) && "Font server failure.");
uint32_t * data = (uint32_t *)font;
data[0] = 6;
data[1] = _font_data[0].width;
data[2] = _font_data[0].height;
data[3] = (6 * 3 + 1) * sizeof(unsigned int);
memcpy(&font[data[3]], _font_data[0].bitmap, _font_data[0].width * _font_data[0].height * 4);
free(_font_data[0].bitmap);
for (int i = 1; i < 6; ++i) {
TRACE(" Loaded %d font(s)... %d %d %d", i, data[(i - 1) * 3 + 2], data[(i - 1) * 3 + 1], data[(i - 1) * 3 + 3]);
data[i * 3 + 1] = _font_data[i].width;
data[i * 3 + 2] = _font_data[i].height;
data[i * 3 + 3] = data[(i - 1) * 3 + 3] + data[(i - 1) * 3 + 2] * data[(i - 1) * 3 + 1] * 4;
memcpy(&font[data[i * 3 + 3]], _font_data[i].bitmap, _font_data[i].width * _font_data[i].height * 4);
free(_font_data[i].bitmap);
}
TRACE("Done loading fonts.");
}
TRACE("Loading sprites...");
#define MOUSE_DIR "/usr/share/cursor/"
load_sprite(&yg->mouse_sprite, MOUSE_DIR "mouse.bmp");

46
lib/sdf.c
View File

@ -5,12 +5,16 @@
#include <stdio.h>
#include <stdlib.h>
#include <syscall.h>
#include <toaru/graphics.h>
#include <toaru/hashmap.h>
#include <toaru/sdf.h>
#include <toaru/spinlock.h>
#define TRACE_APP_NAME "sdf"
#include <toaru/trace.h>
#define BASE_WIDTH 50
#define BASE_HEIGHT 50
@ -40,16 +44,46 @@ static int offset(int ch) {
return ch;
}
static char * _font_data = NULL;
static size_t _font_data_size = 0;
static void load_font(sprite_t * sprite, int font) {
uint32_t * _font_data_i = (uint32_t*)_font_data;
TRACE("Loading font %d", font);
sprite->width = _font_data_i[font * 3 + 1];
sprite->height = _font_data_i[font * 3 + 2];
TRACE("Bitmap size is %d by %d", sprite->width, sprite->height);
int offset = _font_data_i[font * 3 + 3];
sprite->bitmap = (uint32_t *)&_font_data[offset];
sprite->alpha = 0;
sprite->masks = NULL;
sprite->blank = 0;
}
__attribute__((constructor))
static void _init_sdf(void) {
/* Load the font. */
_font_cache = hashmap_create_int(10);
load_sprite(&_font_data_thin, "/usr/share/sdf_thin.bmp");
load_sprite(&_font_data_bold, "/usr/share/sdf_bold.bmp");
load_sprite(&_font_data_mono, "/usr/share/sdf_mono.bmp");
load_sprite(&_font_data_mono_bold, "/usr/share/sdf_mono_bold.bmp");
load_sprite(&_font_data_mono_oblique, "/usr/share/sdf_mono_oblique.bmp");
load_sprite(&_font_data_mono_bold_oblique, "/usr/share/sdf_mono_bold_oblique.bmp");
TRACE("Loading font data.");
{
TRACE("Loading font resource from %s", getenv("DISPLAY"));
char tmp[100];
sprintf(tmp, "sys.%s.fonts", getenv("DISPLAY"));
_font_data = (char *)syscall_shm_obtain(tmp, &_font_data_size);
}
TRACE("Loading individual fonts...");
load_font(&_font_data_thin, SDF_FONT_THIN);
load_font(&_font_data_bold, SDF_FONT_BOLD);
load_font(&_font_data_mono, SDF_FONT_MONO);
load_font(&_font_data_mono_bold, SDF_FONT_MONO_BOLD);
load_font(&_font_data_mono_oblique, SDF_FONT_MONO_OBLIQUE);
load_font(&_font_data_mono_bold_oblique, SDF_FONT_MONO_BOLD_OBLIQUE);
FILE * fi = fopen("/etc/sdf.conf", "r");
char tmp[1024];
char * s = tmp;