Skip to content

Pr 20210430 bugfixes #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Pr 20210430 bugfixes #417

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5b2fe7b
CORE: fix extension of srfi-23 copy-time
0-8-15 Mar 14, 2021
0603b04
GLGUI: fix typo and backward compatible dispatch prefering new code
0-8-15 Jan 11, 2021
145d9b5
GLCORE: fix missing globalbinding and unbound variable
0-8-15 Apr 28, 2021
3c8055d
X11: fix hanging display
0-8-15 Feb 21, 2021
9f5e1c5
CLIPBOARD: make clipboard-copy work under Linux
0-8-15 Apr 29, 2021
bf2072a
X11 CLIPBOARD: fix off-by-one
0-8-15 Apr 29, 2021
4e9612e
GAMBIT: fix incorrect numbers - follwing fix in upstream
0-8-15 Mar 30, 2021
cb12f0d
JSON: add encoding options choice
0-8-15 Apr 11, 2021
4571ef9
ANDROID CLIPBOARD: support coerce mimetypes to text/plain
0-8-15 Apr 11, 2021
f8c84e1
BUILD: ensure failures to compile hook.c break build
0-8-15 Apr 24, 2021
b39b45b
MICROGL: add support for pageup/down
0-8-15 Feb 13, 2021
9c435d2
MICROGL X11: avoid some of the needless redraw events
0-8-15 Feb 13, 2021
c840068
MICROGL X11: avoid some of the needless redraw events
0-8-15 Feb 13, 2021
0df21ed
Merge branch 'pr-20210430-bugfixes' of github.com:0-8-15/lambdanative…
0-8-15 Apr 29, 2021
fb2a000
clean up merge artefact
0-8-15 Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions modules/ln_glgui/primitives.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;; Reducing the computational complexity of font operations improves
;;; rendering time.

(define-type ln-ttf:glyph
macros: prefix: macro-
desc ;; for now legacy: (key (texcoord1..4) X Y Z)
width
height
texture
texcoords ;; generic 4 element vector of flownums
rect-texcoords ;; 4x2 element f32vector
;; order is sorta important here
offsetx
advancex
offsety
)

(define (ttf:glyph? obj) (macro-ln-ttf:glyph? obj))
(define (ttf:glyph-desc obj) (macro-ln-ttf:glyph-desc obj))
(define (ttf:glyph-width obj) (macro-ln-ttf:glyph-width obj))
(define (ttf:glyph-height obj) (macro-ln-ttf:glyph-height obj))
(define (ttf:glyph-image obj) (macro-ln-ttf:glyph-texture obj))
(define (ttf:glyph-texcoords obj) (macro-ln-ttf:glyph-texcoords obj))
(define (ttf:glyph-rect-texcoords obj) (macro-ln-ttf:glyph-rect-texcoords obj))
(define (ttf:glyph-offsetx obj) (macro-ln-ttf:glyph-offsetx obj))
(define (ttf:glyph-advancex obj) (macro-ln-ttf:glyph-advancex obj))
(define (ttf:glyph-offsety obj) (macro-ln-ttf:glyph-offsety obj))

(define-type ln-ttf:font
macros: prefix: macro-
desc ;; for now the legacy description of a font as a assoc-list
Expand Down Expand Up @@ -298,10 +323,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
(loop (fl+ x0 gax) (cdr cs))))))

(define (glgui:fontheight fnt)
(let* ((g (assoc 0 fnt))
(i (if g (glgui:glyph-image g) #f))
(h (if i (glgui:image-h i)
(cadr (cadr (car fnt)))))) h))
(cond
((macro-ln-ttf:font? fnt) (ttf:glyph-height (MATURITY+1:ln-ttf:font-ref fnt 0)))
Copy link
Contributor

@mgorges mgorges May 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is MATURITY+1 here - it is not defined?

((find-font fnt) => glgui:fontheight)
(else ;; MATURITY -1 backward compatible, the old code
(let* ((g (assoc 0 fnt))
(i (if g (glgui:glyph-image g) #f))
(h (if i (glgui:image-h i)
(cadr (cadr (car fnt)))))) h))))

(define (glgui:stringheight txt fnt)
(define font (find-font fnt))
Expand Down