From 9842a86563058cc04dc06cd07fcede688c36d8df Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sun, 15 Dec 2024 22:14:51 +0530 Subject: Add embedding of font --- TODO.norg | 2 - chelleport.cabal | 11 +++++- flake.nix | 60 +++++++++++++++++++----------- src/Chelleport/Context.hs | 9 ++++- static/OFL.txt | 93 ++++++++++++++++++++++++++++++++++++++++++++++ static/font.ttf | Bin 0 -> 310252 bytes 6 files changed, 149 insertions(+), 26 deletions(-) create mode 100644 static/OFL.txt create mode 100644 static/font.ttf diff --git a/TODO.norg b/TODO.norg index 435af0d..d47b4c5 100644 --- a/TODO.norg +++ b/TODO.norg @@ -1,5 +1,4 @@ * Current - - ( ) Include font and embed in build - ( ) Multimonitor mouse move issue * Later @@ -8,5 +7,4 @@ - ( ) Middle click * Maybe - - ( ) Move cursor on the first 2 keys to the center of the section - ( ) Select / drag n drop diff --git a/chelleport.cabal b/chelleport.cabal index 9238694..897ea7b 100644 --- a/chelleport.cabal +++ b/chelleport.cabal @@ -9,6 +9,11 @@ build-type: Simple synopsis: Mouse control description: Mouse control +Flag release + Description: Release build options + Manual: True + Default: False + common common-config default-extensions: ExplicitForAll, @@ -29,6 +34,8 @@ common warnings -Wall -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-foralls -Wextra -Wno-unused-do-bind -Wname-shadowing -fwarn-tabs -fprint-explicit-foralls -fprint-explicit-kinds + if flag(release) + ghc-options: -O2 -Werror executable chelleport import: common-config, warnings @@ -41,10 +48,12 @@ library lib-chelleport import: common-config, warnings hs-source-dirs: src build-depends: + bytestring, + file-embed == 0.0.16.0, sdl2 == 2.5.5.0, sdl2-ttf == 2.1.3, - X11 == 1.10.3, vector == 0.13.1.0, + X11 == 1.10.3, xtest == 0.2 exposed-modules: Chelleport diff --git a/flake.nix b/flake.nix index e5ba93a..c7c2058 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,8 @@ inputs.haskell-flake.flakeModule ]; - perSystem = { self', pkgs, lib, config, ... }: { - haskellProjects.default = { + perSystem = { self', pkgs, lib, config, ... }: + let projectRoot = builtins.toString (lib.fileset.toSource { root = ./.; fileset = lib.fileset.unions [ @@ -22,30 +22,48 @@ ./chelleport.cabal ]; }); + otherFiles = [ + { source = ./static; target = "static"; } + ]; + in { + haskellProjects.default = { + inherit projectRoot; - packages = {}; - settings = {}; + packages = {}; + settings = { + chelleport = { + deadCodeElimination = true; + staticLibraries = true; + # extraBuildFlags = ["+release"]; + strip = true; + custom = drv: drv.overrideAttrs(old: { + preBuild = '' + ${toString (map (f: ''cp -r ${f.source} ${f.target};'') otherFiles)} + ''; + }); + }; + }; - devShell = { - # tools = hp: { fourmolu = hp.fourmolu; ghcid = null; }; - hlsCheck.enable = false; - }; + devShell = { + # tools = hp: { fourmolu = hp.fourmolu; ghcid = null; }; + hlsCheck.enable = false; + }; - autoWire = [ "packages" "apps" "checks" ]; - }; + autoWire = [ "packages" "apps" "checks" ]; + }; - packages.default = self'.packages.chelleport; - apps.default = self'.apps.chelleport; + packages.default = self'.packages.chelleport; + apps.default = self'.apps.chelleport; - devShells.default = pkgs.mkShell { - inputsFrom = [ - config.haskellProjects.default.outputs.devShell - ]; - packages = with pkgs; [ - just - nodemon - ]; + devShells.default = pkgs.mkShell { + inputsFrom = [ + config.haskellProjects.default.outputs.devShell + ]; + packages = with pkgs; [ + just + nodemon + ]; + }; }; - }; }; } diff --git a/src/Chelleport/Context.hs b/src/Chelleport/Context.hs index de5c94b..17fdae0 100644 --- a/src/Chelleport/Context.hs +++ b/src/Chelleport/Context.hs @@ -1,6 +1,8 @@ -module Chelleport.Context where +module Chelleport.Context (initializeContext) where import Chelleport.Types +import Data.ByteString (ByteString) +import Data.FileEmbed (embedFileRelative) import Foreign.C (CFloat) import qualified Graphics.X11 as X11 import SDL (($=)) @@ -29,9 +31,12 @@ initializeContext = do ctxX11Display = display } +rawFontData :: ByteString +rawFontData = $(embedFileRelative "./static/font.ttf") + loadFont :: IO TTF.Font loadFont = do - font <- TTF.load "Inter-Regular.ttf" fontSize + font <- TTF.decode rawFontData fontSize TTF.setStyle font [TTF.Bold] pure font diff --git a/static/OFL.txt b/static/OFL.txt new file mode 100644 index 0000000..d05ec4b --- /dev/null +++ b/static/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter) + +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://openfontlicense.org + + +----------------------------------------------------------- +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/static/font.ttf b/static/font.ttf new file mode 100644 index 0000000..5e4851f Binary files /dev/null and b/static/font.ttf differ -- cgit v1.3.1