diff --git a/cmd/mxl-player/main.go b/cmd/mxl-player/main.go index 7726c2d..faa5a14 100644 --- a/cmd/mxl-player/main.go +++ b/cmd/mxl-player/main.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "log" + "mxl-player/internal/assets" "mxl-player/internal/imgui" "mxl-player/internal/playback" "mxl-player/internal/renderer" @@ -232,12 +233,17 @@ func main() { } defer sdl.DestroyWindow(windowHandler) + fontData, fontDataSize, releaseFont := assets.PinUIFont() + defer releaseFont() + // ImGui init gui := imgui.New() defer gui.Destroy() fontConfig := cimgui.NewFontConfig() - font := gui.IO().Fonts().AddFontFromFileTTFV( - "/home/itten/Downloads/JetBrainsMono/JetBrainsMonoNLNerdFontMono-Regular.ttf", + fontConfig.SetFontDataOwnedByAtlas(false) + font := gui.IO().Fonts().AddFontFromMemoryTTFV( + fontData, + fontDataSize, 18, fontConfig, nil, diff --git a/internal/assets/font.go b/internal/assets/font.go new file mode 100644 index 0000000..4d0ccfb --- /dev/null +++ b/internal/assets/font.go @@ -0,0 +1,23 @@ +package assets + +import ( + _ "embed" + "runtime" + "unsafe" +) + +// uiFont contains the player UI font so the executable does not depend on a +// machine-specific font installation. +// +//go:embed fonts/JetBrainsMonoNLNerdFontMono-Regular.ttf +var uiFont []byte + +// PinUIFont returns the embedded font data and a release function. ImGui keeps +// the supplied pointer until its font atlas is destroyed, so callers must keep +// the data pinned and invoke release only after destroying the ImGui context. +func PinUIFont() (data uintptr, size int32, release func()) { + pinner := new(runtime.Pinner) + pinner.Pin(&uiFont[0]) + + return uintptr(unsafe.Pointer(&uiFont[0])), int32(len(uiFont)), pinner.Unpin +} diff --git a/internal/assets/font_test.go b/internal/assets/font_test.go new file mode 100644 index 0000000..3e68325 --- /dev/null +++ b/internal/assets/font_test.go @@ -0,0 +1,18 @@ +package assets + +import "testing" + +func TestEmbeddedUIFont(t *testing.T) { + data, size, release := PinUIFont() + defer release() + + if data == 0 { + t.Fatal("embedded UI font has a nil data pointer") + } + if size < 4 { + t.Fatalf("embedded UI font is too small: %d bytes", size) + } + if string(uiFont[:4]) != "\x00\x01\x00\x00" { + t.Fatalf("embedded UI font has unexpected TrueType signature % x", uiFont[:4]) + } +} diff --git a/internal/assets/fonts/JetBrainsMonoNLNerdFontMono-Regular.ttf b/internal/assets/fonts/JetBrainsMonoNLNerdFontMono-Regular.ttf new file mode 100644 index 0000000..ec7c67b Binary files /dev/null and b/internal/assets/fonts/JetBrainsMonoNLNerdFontMono-Regular.ttf differ diff --git a/internal/assets/fonts/OFL.txt b/internal/assets/fonts/OFL.txt new file mode 100644 index 0000000..8bee414 --- /dev/null +++ b/internal/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/internal/assets/fonts/README.md b/internal/assets/fonts/README.md new file mode 100644 index 0000000..d467cca --- /dev/null +++ b/internal/assets/fonts/README.md @@ -0,0 +1,9 @@ +# JetBrainsMonoNL Nerd Font Mono + +`JetBrainsMonoNLNerdFontMono-Regular.ttf` is the regular, no-ligatures, +monospaced variant of JetBrains Mono patched by the Nerd Fonts project. + +Source: + +The font is distributed under the SIL Open Font License 1.1. The complete +license and copyright notice are included in `OFL.txt`.