add emoji font.

fix: 97ae9b1709

dat.h

@@ -17,7 +17,7 @@ enum
 
 	Fontsz	= 32,
 	Fontbase	= 4,
-	Nglyphs	= 65536,
+	Nglyphs	= 0x20000,
 };
 
 enum

font.c

@@ -10,9 +10,12 @@ struct Glyph
 	int w, h, ox, oy;
 };
 
-static stbtt_fontinfo font;
+enum { Maxfonts = 4 };
-static uchar *fontdata;
+
-static float scale;
+static stbtt_fontinfo fonts[Maxfonts];
+static uchar *fontdata[Maxfonts];
+static float scale[Maxfonts];
+static int nfonts;
 static Glyph cache[Nglyphs];
 static u32int blendtab[2][256];
 
@@ -28,25 +31,64 @@ blend(u32int bg, int a)
 	return (r << 16) | (g << 8) | b;
 }
 
-void
+static void
-fontinit(char *path)
+loadfont(char *path)
 {
-	int fd, a;
+	int fd;
 	long sz, n;
 
+	if(nfonts >= Maxfonts)
+		die("too many fonts");
 	fd = open(path, OREAD);
 	if(fd < 0)
 		die("can't open font: %s", path);
 	sz = seek(fd, 0, 2);
 	seek(fd, 0, 0);
-	fontdata = emalloc(sz);
+	fontdata[nfonts] = emalloc(sz);
-	n = readn(fd, fontdata, sz);
+	n = readn(fd, fontdata[nfonts], sz);
 	close(fd);
 	if(n != sz)
 		die("can't read font: %s", path);
-	if(!stbtt_InitFont(&font, fontdata, stbtt_GetFontOffsetForIndex(fontdata, 0)))
+	if(!stbtt_InitFont(&fonts[nfonts], fontdata[nfonts], stbtt_GetFontOffsetForIndex(fontdata[nfonts], 0)))
 		die("can't init font: %s", path);
-	scale = stbtt_ScaleForPixelHeight(&font, Fontsz);
+	scale[nfonts] = stbtt_ScaleForPixelHeight(&fonts[nfonts], Fontsz);
+	nfonts++;
+}
+
+static int
+isfont(char *name)
+{
+	char *p;
+
+	p = strrchr(name, '.');
+	if(p == nil)
+		return 0;
+	return strcmp(p, ".ttf") == 0 || strcmp(p, ".otf") == 0;
+}
+
+void
+fontinit(char *dir)
+{
+	int fd, n, i, a;
+	Dir *d;
+	char path[256];
+
+	fd = open(dir, OREAD);
+	if(fd < 0)
+		die("can't open font dir: %s", dir);
+	n = dirreadall(fd, &d);
+	close(fd);
+	if(n < 0)
+		die("can't read font dir: %s", dir);
+	for(i = 0; i < n; i++){
+		if(isfont(d[i].name)){
+			snprint(path, sizeof path, "%s/%s", dir, d[i].name);
+			loadfont(path);
+		}
+	}
+	free(d);
+	if(nfonts == 0)
+		die("no fonts in %s", dir);
 	for(a = 0; a < 256; a++){
 		blendtab[0][a] = blend(Colbg, a);
 		blendtab[1][a] = blend(Colsel, a);
@@ -57,14 +99,20 @@ void
 putfont(u32int *buf, int w, int h, int px, int py, Rune r)
 {
 	Glyph *g;
-	int i, j, x, y, a, sel;
+	int i, j, x, y, a, sel, f;
 	u32int *p;
 
 	if(r >= Nglyphs)
 		return;
 	g = &cache[r];
 	if(g->bmp == nil){
-		g->bmp = stbtt_GetCodepointBitmap(&font, scale, scale, r, &g->w, &g->h, &g->ox, &g->oy);
+		for(f = 0; f < nfonts; f++){
+			if(stbtt_FindGlyphIndex(&fonts[f], r) == 0)
+				continue;
+			g->bmp = stbtt_GetCodepointBitmap(&fonts[f], scale[f], scale[f], r, &g->w, &g->h, &g->ox, &g->oy);
+			if(g->bmp != nil)
+				break;
+		}
 		if(g->bmp == nil)
 			return;
 	}

font/font.otf

@@ -1 +0,0 @@
-NotoSansMonoCJKsc-Regular.otf

main.c

@@ -5,7 +5,7 @@ Channel *drawc;
 Channel *keyc;
 Channel *dictreqc;
 Channel *dictresc;
-char *fontpath;
+char *fontdir;
 
 int
 threadmaybackground(void)
@@ -16,7 +16,7 @@ threadmaybackground(void)
 void
 usage(void)
 {
-	fprint(2, "usage: strans mapdir fontpath\n");
+	fprint(2, "usage: strans mapdir fontdir\n");
 	threadexitsall("usage");
 }
 
@@ -60,7 +60,7 @@ threadmain(int argc, char **argv)
 	if(argc != 3)
 		usage();
 
-	fontpath = argv[2];
+	fontdir = argv[2];
 	drawc = chancreate(sizeof(Drawcmd), 0);
 	keyc = chancreate(sizeof(Keyreq), 0);
 	dictreqc = chancreate(sizeof(Dictreq), 4);

run.sh

@@ -4,6 +4,6 @@ pkill strans
 pkill strans-xim
 
 sleep 1
-./strans map font/font.otf &
+./strans map font &
 sleep 1
 xim/strans-xim &

win.c

@@ -6,7 +6,7 @@ enum {
 	Asciitofull = 0xFEE0,
 };
 
-extern char *fontpath;
+extern char *fontdir;
 
 static xcb_connection_t *conn;
 static xcb_screen_t *scr;
@@ -52,7 +52,7 @@ wininit(void)
 	gc = xcb_generate_id(conn);
 	xcb_create_gc(conn, gc, win, 0, nil);
 	img = emalloc(Imgw * Imgh * sizeof(img[0]));
-	fontinit(fontpath);
+	fontinit(fontdir);
 }
 
 static void