From 94b789ae8892021c44b25c18cdb9284a0395308a Mon Sep 17 00:00:00 2001 From: Daniel Hartwig Date: Tue, 12 Feb 2013 15:22:16 +0800 Subject: [PATCH] pass pairs to set-initial-window-{position,size} * figl/glut.scm (set-initial-window-position): (set-initial-window-size): Change arguments to a pair, matching the output of the corresponding getters and initialize-glut keyword arguments. --- figl/glut.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/figl/glut.scm b/figl/glut.scm index 153cdb9..828664c 100644 --- a/figl/glut.scm +++ b/figl/glut.scm @@ -37,9 +37,16 @@ ;;; 2 Initialization ;;; -(re-export (%glutInitWindowPosition . set-initial-window-position) - (%glutInitWindowSize . set-initial-window-size) - (%glutInitDisplayMode . set-initial-display-mode)) +(define (set-initial-window-position position) + (%glutInitWindowPosition (car position) (cdr position))) + +(define (set-initial-window-size size) + (%glutInitWindowSize (car size) (cdr size))) + +(export set-initial-window-position + set-initial-window-size) + +(re-export (%glutInitDisplayMode . set-initial-display-mode)) (define glut-init? #f) @@ -285,8 +292,7 @@ (%glutTabletMotionFunc . set-tablet-motion-callback) (%glutTabletButtonFunc . set-tablet-button-callback) (%glutMenuStatusFunc . set-menu-status-callback) - (%glutIdleFunc . set-idle-callback) - (%glutTimerFunc . add-timer-callback)) + (%glutIdleFunc . set-idle-callback)) ;;; -- 2.20.1