diff --git a/scheme/examples/hello.scm b/scheme/examples/hello.scm index c405191..cbe4557 100755 --- a/scheme/examples/hello.scm +++ b/scheme/examples/hello.scm @@ -21,14 +21,14 @@ (display-default-root-window dpy) 100 200 300 200 10 'copy-from-parent 'copy-from-parent 'copy-from-parent - (quasiquote - ((,(set-window-attribute event-mask) . (exposure button-press)) - (,(set-window-attribute background-pixel) . ,white) - (,(set-window-attribute colormap) . ,cm))))) + (make-set-window-attribute-alist + (event-mask (event-mask exposure button-press)) + (background-pixel white) + (colormap cm)))) (gc (create-gcontext win - (list (cons (gc-value background) white) - (cons (gc-value foreground) black)))) + (make-gc-value-alist (background white) + (foreground black)))) (font (open-font dpy "*-new century schoolbook-bold-r*24*")) (font2 (open-font dpy "*times*18*"))) (set-wm-name! win '("scx Hello World Program")) @@ -38,18 +38,18 @@ (display-flush-output dpy) (let ((e (wait-event dpy))) (if - (case (event-type e) - ((expose) - (set-gcontext-font! gc font) - (set-gcontext-foreground! gc black) - (draw-poly-text win gc 10 25 text '1-byte) - (set-gcontext-foreground! gc blue) - (draw-poly-text win gc 20 50 (list font text) '1-byte) - (set-gcontext-foreground! gc red) - (set-gcontext-font! gc font2) - (draw-image-text win gc 30 75 text '1-byte) - #t) - (else #f)) + (cond + ((expose-event? e) + (set-gcontext-font! gc font) + (set-gcontext-foreground! gc black) + (draw-poly-text win gc 10 25 text '1-byte) + (set-gcontext-foreground! gc blue) + (draw-poly-text win gc 20 50 (list font text) '1-byte) + (set-gcontext-foreground! gc red) + (set-gcontext-font! gc font2) + (draw-image-text win gc 30 75 text '1-byte) + #t) + (else #f)) (event-loop) #f))) (close-display dpy)))