scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ fixed typo 

+ fixed import of c vars
This commit is contained in:
eknauel 2003-10-16 16:05:03 +00:00
parent a289e7a1d3
commit 5c69abfa05
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scheme/libs/xft.scm
View File

@ -15,8 +15,7 @@
(define-record-type xft-draw :xft-draw (define-record-type xft-draw :xft-draw
(make-xft-draw c-pointer) (make-xft-draw c-pointer)
xft-dra xft-draw?
w?
(c-pointer xft-draw-c-pointer)) (c-pointer xft-draw-c-pointer))
(define-exported-binding "xft-draw" :xft-draw) (define-exported-binding "xft-draw" :xft-draw)
@ -56,11 +55,11 @@
(define (scx-xft-font-match display screen xft-pattern) (define (scx-xft-font-match display screen xft-pattern)
(call-with-values (call-with-values
(lambda ()
(scx-xft-font-match-internal display screen xft-pattern))
(lambda (result xft-pattern) (lambda (result xft-pattern)
(add-finalizer! xft-pattern scx-xft-pattern-destroy) (add-finalizer! xft-pattern scx-xft-pattern-destroy)
(values result xft-pattern)) (values result xft-pattern))))
(lambda ()
(scx-xft-font-match-internal display screen xft-pattern))))
(define (scx-xft-font-open-pattern display xft-pattern) (define (scx-xft-font-open-pattern display xft-pattern)
(let ((xft-font (scx-xft-font-open-pattern-internal display xft-pattern))) (let ((xft-font (scx-xft-font-open-pattern-internal display xft-pattern)))
@ -116,12 +115,41 @@
visual visual
(error "XftDrawVisual() unavailable in this version of Xft")))) (error "XftDrawVisual() unavailable in this version of Xft"))))
;;; import values from C code
(define scx-xft-version-major
(shared-binding-ref
(lookup-imported-binding "scx-xft-version-major")))
(define scx-xft-version-minor
(shared-binding-ref
(lookup-imported-binding "scx-xft-version-minor")))
(define scx-xft-result-match
(shared-binding-ref
(lookup-imported-binding "scx-xft-result-match")))
(define scx-xft-result-no-match
(shared-binding-ref
(lookup-imported-binding "scx-xft-result-no-match")))
(define scx-xft-result-type-mismatch
(shared-binding-ref
(lookup-imported-binding "scx-xft-result-type-mismatch")))
(define scx-xft-result-no-id
(shared-binding-ref
(lookup-imported-binding "scx-xft-result-no-id")))
;;; import functions from C code ;;; import functions from C code
(import-lambda-definition scx-xft-pattern-create (import-lambda-definition scx-xft-pattern-create
() ()
"scx_XftPatternCreate") "scx_XftPatternCreate")
(import-lambda-definition scx-xft-pattern-destroy
()
"scx_XftPatternDestroy")
(import-lambda-definition scx-xft-pattern-duplicate-internal (import-lambda-definition scx-xft-pattern-duplicate-internal
(xft-pattern) (xft-pattern)
"scx_XftPatternDuplicate") "scx_XftPatternDuplicate")
@ -206,6 +234,10 @@
() ()
"scx_XftObjectSetCreate") "scx_XftObjectSetCreate")
(import-lambda-definition scx-xft-objectset-destroy
(xft-objectset)
"scx_XftObjectSetDestroy")
(import-lambda-definition scx-xft-objectset-add (import-lambda-definition scx-xft-objectset-add
(xft-objectset object) (xft-objectset object)
"scx_XftObjectSetAdd") "scx_XftObjectSetAdd")
@ -214,6 +246,3 @@
(diplay screen xft-pattern xft-objectset) (diplay screen xft-pattern xft-objectset)
"scx_XftListFontsPatternObjects") "scx_XftListFontsPatternObjects")