;;;;
;;;; (c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
-(define-module (scm framework-gnome)
- :use-module (oop goops)
- #:export (<gnome-outputter>))
+;;;; See output-gnome.scm for usage information.
-;;(define this-module (current-module))
+
+(define-module (scm framework-gnome))
(use-modules (guile) (oop goops) (lily))
(use-modules
+ (srfi srfi-2)
+ (ice-9 regex)
(gnome gtk)
(gnome gtk gdk-event)
- ;;
-;; (scm output-gnome)
- )
-
-;; the name of the module will change to canvas rsn
-(if (resolve-module '(gnome gw canvas))
- (use-modules (gnome gw canvas))
- (use-modules (gnome gw libgnomecanvas)))
+ (gnome gw canvas))
+
+(define-public (output-framework outputter book scopes fields basename)
+ (gnome-main book))
(define SCROLLBAR-SIZE 20)
(define BUTTON-HEIGHT 25)
(define PIXELS-PER-UNIT 2)
(define OUTPUT-SCALE (* 2.5 PIXELS-PER-UNIT))
+(define-public output-scale OUTPUT-SCALE)
-;; helper functions -- sort this out
(define (stderr string . rest)
- ;; debugging
- (if #t
- (begin
- (apply format (cons (current-error-port) (cons string rest)))
- (force-output (current-error-port)))))
-
-
-;; Hmm, actually, the only vars really needed by output-gnome are
-;; * (root (canvas go))
-;; * location
-;; * item-locations
-;; * pixels-per-unit
-;; * text-items
-;;
-;; so this class could be split in two parts / records?
+ (apply format (cons (current-error-port) (cons string rest)))
+ (force-output (current-error-port)))
+
+(define (debugf string . rest)
+ (if #f
+ (stderr (cons string rest))))
+
(define-class <gnome-outputter> ()
(page-stencils ;;#:init-value '#()
#:init-keyword #:page-stencils #:accessor page-stencils)
(page-number #:init-value 0 #:accessor page-number)
(pixels-per-unit #:init-value PIXELS-PER-UNIT #:accessor pixels-per-unit)
(text-items #:init-value '() #:accessor text-items)
- (location #:init-value #:f #:accessor location)
- (item-locations #:init-value (make-hash-table 31) #:accessor item-locations)
+ (grob #:init-value #f #:accessor grob)
+ (item-grobs #:init-value (make-hash-table 31) #:accessor item-grobs)
(window-width #:init-keyword #:window-width #:accessor window-width)
(window-height #:init-keyword #:window-height #:accessor window-height)
(canvas-width #:init-keyword #:canvas-width #:accessor canvas-width)
(canvas-height #:init-keyword #:canvas-height #:accessor canvas-height))
-;;(define-method (initialize (go <gnome-outputter>))
-;; )
-
-(define (setup go)
+(define-method (initialize (go <gnome-outputter>))
(let* ((button (make <gtk-button> #:label "Exit"))
(next (make <gtk-button> #:label "Next"))
(prev (make <gtk-button> #:label "Previous"))
(hbox (make <gtk-hbox> #:homogeneous #f)))
(set-size-request (window go) (window-width go) (window-height go))
+
+ (set-size-request (scrolled go) (window-width go) (- (window-height go)
+ BUTTON-HEIGHT
+ SCROLLBAR-SIZE))
(new-canvas go)
(add vbox hbox)
(set-size-request hbox (window-width go) BUTTON-HEIGHT)
- ;; hmm?
+ ;; hmm? These are broken when using <gnome-outputter>.
;;(set-child-packing vbox hbox #f #f 0 'end)
;;(set-child-packing hbox button #f #f 0 'end)
(set-size-request button (quotient (window-width go) 2) BUTTON-HEIGHT)
+
+
(add hbox next)
(add hbox prev)
(add hbox button)
;; signals
- (gtype-instance-signal-connect
- button 'clicked (lambda (b) (gtk-main-quit)))
- (gtype-instance-signal-connect
- next 'clicked (lambda (b) (dump-page go (1+ (page-number go)))))
- (gtype-instance-signal-connect
- prev 'clicked (lambda (b) (dump-page go (1- (page-number go)))))
- (gtype-instance-signal-connect
- (window go) 'key-press-event key-press-event)
+ (connect button 'clicked (lambda (b) (gtk-main-quit)))
+ (connect next 'clicked (lambda (b) (dump-page go (1+ (page-number go)))))
+ (connect prev 'clicked (lambda (b) (dump-page go (1- (page-number go)))))
+ (connect (window go) 'key-press-event
+ (lambda (w e) (key-press-event go w e)))
(show-all (window go))))
-(define-public (output-framework-gnome outputter book scopes fields basename)
+(define (gnome-main book)
(let* ((book-paper (ly:paper-book-book-paper book))
-
- (hsize (ly:output-def-lookup book-paper 'hsize))
+ (hsize (ly:output-def-lookup book-paper 'hsize))
(vsize (ly:output-def-lookup book-paper 'vsize))
(page-width (inexact->exact (ceiling (* OUTPUT-SCALE hsize))))
(page-height (inexact->exact (ceiling (* OUTPUT-SCALE vsize))))
(min (+ BUTTON-HEIGHT SCROLLBAR-SIZE (* page-height 2))
desktop-height))))
- (setup go)
- (dump-page go 0)
- (gtk-main)))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;; gnome stuff --- move to framework-gnome
-;;(define (dump-page (go <gnome-outputter>) number)
-
-(define output-gnome-module
- (make-module 1021 (list (resolve-interface '(scm output-gnome)))))
-
-(define-public (gnome-output-expression go expr)
- (stderr "HI\n")
- (let ((m output-gnome-module))
-
- ;; this does not seem to work?
- ;;/home/janneke/cvs/savannah/lilypond/lilypond/share/lilypond/scm/output-gnome.scm:267:27: While evaluating arguments to canvas in expression (canvas go):
- ;;/home/janneke/cvs/savannah/lilypond/lilypond/share/lilypond/scm/output-gnome.scm:267:27: Unbound variable: go
+ ;; ugh. The GOOPS doc promises this is called automagically.
+ ;; possibly a goops 1.6.4 problem
+ (initialize go)
- (module-define! m 'go go)
-
- (eval expr m)))
+ (map ly:pango-add-afm-decoder
+ '("lilypond-feta"
+ "lilypond-braces"
+ "lilypond-dyn"
+ "lilypond-parmesan"))
+ (dump-page go 0)
+ (gtk-main)))
(define (dump-page go number)
(if (or (not (page-stencils go))
(new-canvas go)
(set! (page-number go) number)
- ;; no destroy method for gnome-canvas-text?
+ ;; no destroy method for gnome-canvas-text yet.
;;(map destroy (gtk-container-get-children main-canvas))
;;(map destroy text-items)
- ;;Hmm
- ;;(set! main-canvas canvas)
(set! (text-items go) '())
- ;;(ly:outputter-dump-stencil output-canvas
- ;; (vector-ref page-stencils page-number))
- (stderr "page-stencil ~S: ~S\n"
+ (debugf "page-stencil ~S: ~S\n"
(page-number go)
(vector-ref (page-stencils go) (page-number go)))
(ly:interpret-stencil-expression
- ;;(vector-ref (page-stencils go) (page-number go))
+ ;; ;;(vector-ref (page-stencils go) (page-number go))
(ly:stencil-expr (vector-ref (page-stencils go) (page-number go)))
gnome-output-expression go '(0 . 0))
-
+
(if old-canvas (destroy old-canvas))
(add (scrolled go) (canvas go))
(show (canvas go)))))
ifs)
(define (spawn-editor location)
- (let* ((line (car location))
- (column (cadr location))
- (file-name (caddr location))
+ (let* ((file-name (car location))
+ (line (cadr location))
+ (column (caddr location))
(template (substring (get-x-editor) 0))
;; Adhere to %l %c %f?
'post)
'pre (number->string line) 'post)))
- (stderr "spawning: ~s\n" command)
+ (debugf "spawning: ~s\n" command)
(if (= (primitive-fork) 0)
(let ((command-list (string-split command #\ )));; (get-ifs))))
(apply execlp command-list)
(define location-callback spawn-editor)
-(define (item-event item event . data)
+(define (get-location grob)
+ (and-let* ((p? (procedure? point-and-click))
+ (g grob)
+ (cause (ly:grob-property grob 'cause))
+ (music-origin (if (ly:music? cause)
+ (ly:music-property cause 'origin)
+ ;; How come #<unspecied> [and '()]
+ ;; are #t? :-(
+ #f)))
+ (if (ly:input-location? music-origin)
+ (ly:input-location music-origin)
+ #f)))
+
+;;;(define (item-event go grob item event)
+(define (item-event go item event)
(case (gdk-event:type event)
((enter-notify) (gobject-set-property item 'fill-color "red"))
((leave-notify) (gobject-set-property item 'fill-color "black"))
((button-press)
- (let ((location (hashq-ref item-locations item #f)))
- (if location
- (location-callback location)
- (stderr "no location\n"))))
- ((2button-press) (gobject-set-property item 'fill-color "red")))
+ (let ((button (gdk-event-button:button event)))
+ (cond
+ ((= button 1)
+ (and-let* ((grob (hashq-ref (item-grobs go) item #f))
+ (location (get-location grob)))
+ (location-callback location)))
+ ((= button 2)
+
+ (and-let*
+ ((grob (hashq-ref (item-grobs go) item #f)))
+
+ (let ((properties (ly:grob-properties grob))
+ (basic-properties (ly:grob-basic-properties grob))
+ (x (inexact->exact (gdk-event-button:x-root event)))
+ (y (inexact->exact (gdk-event-button:y-root event))))
+
+ (debugf "GROB: ~S\n" grob)
+ (debugf "PROPERTIES: ~S\n" properties)
+ (debugf "BASIC PROPERTIES: ~S\n" basic-properties)
+
+ (let ((window (make <gtk-window>))
+ (vbox (make <gtk-vbox>))
+ (button (make <gtk-button> #:label "Ok")))
+
+ (add window vbox)
+ (connect button 'clicked (lambda (b) (destroy window)))
+
+ (for-each
+ (lambda (x)
+ (let ((button (make <gtk-button>
+ #:xalign 0.0
+ #:label
+ (string-append
+ (symbol->string (car x))
+ ": "
+ (format #f "~S" (cdr x))))))
+ (set-size-request button 150 BUTTON-HEIGHT)
+ (add vbox button)))
+ properties)
+ (add vbox button)
+
+ ;; FIXME: how to do window placement?
+ ;; - no effect:
+ (move window x y)
+ (show-all window)
+ ;; - shows actual movement:
+ (move window x y)
+ )))))))
+
+ ((2button-press) (gobject-set-property item 'fill-color "green")))
#t)
-(define (scale-canvas factor)
- (set! pixels-per-unit (* pixels-per-unit factor))
- (set-pixels-per-unit main-canvas pixels-per-unit)
+(define (scale-canvas go factor)
+ (set! (pixels-per-unit go) (* (pixels-per-unit go) factor))
+ (set-pixels-per-unit (canvas go) (pixels-per-unit go))
(for-each
(lambda (x)
(let ((scale (gobject-get-property x 'scale))
(points (gobject-get-property x 'size-points)))
;;(gobject-set-property x 'scale pixels-per-unit)
(gobject-set-property x 'size-points (* points factor))))
- text-items))
+ (text-items go)))
-(define (key-press-event item event . data)
+(define (key-press-event go item event)
(let ((keyval (gdk-event-key:keyval event))
(mods (gdk-event-key:modifiers event)))
(cond ((and (or (eq? keyval gdk:q)
(gtk-main-quit))
((and #t ;;(null? mods)
(eq? keyval gdk:plus))
- (scale-canvas 2))
+ (scale-canvas go 2))
((and #t ;; (null? mods)
(eq? keyval gdk:minus))
- (scale-canvas 0.5))
+ (scale-canvas go 0.5))
((or (eq? keyval gdk:Page-Up)
(eq? keyval gdk:BackSpace))
- (dump-page (1- page-number)))
+ (dump-page go (1- (page-number go))))
((or (eq? keyval gdk:Page-Down)
(eq? keyval gdk:space))
- (dump-page (1+ page-number))))
+ (dump-page go (1+ (page-number go)))))
#f))
-;;(define (new-canvas go <gnome-outputter>)
(define (new-canvas go)
(set! (canvas go) (make <gnome-canvas>))
(set-size-request (canvas go) (window-width go) (window-height go))
#:x2 (canvas-width go) #:y2 (canvas-height go)
#:fill-color "white"))
+(define output-gnome-module #f)
+(define (get-output-gnome-module go)
+ (if (not output-gnome-module)
+ (let ((m (resolve-module '(scm output-gnome))))
+ (module-define! m 'canvas-root (lambda () (root (canvas go))))
+ (module-define! m 'output-scale output-scale)
+ (set! output-gnome-module m)))
+ output-gnome-module)
+
+(define-public (gnome-output-expression go expr)
+ (let* ((m (get-output-gnome-module go))
+ (result (eval expr m)))
+ (cond
+ ((ly:grob? result) (set! (grob go) result))
+ ((is-a? result <gnome-canvas-item>)
+
+ ;; AAARGH; grobs happen after stencils
+ ;; (connect result 'event (lambda (w e) (item-event go (grob go) w e)))
+ (connect result 'event (lambda (w e) (item-event go w e)))
+ (if (grob go)
+ (hashq-set! (item-grobs go) result (grob go)))
+ (set! (grob go) #f)
+
+ (if (is-a? result <gnome-canvas-text>)
+ (set! (text-items go) (cons result (text-items go))))))))
+
projects / lilypond.git / blobdiff