suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trying to get events to work next

Browse Source
This commit is contained in:
Danny Yoo 2011-08-23 16:39:27 -04:00
parent 24030a4cfd
commit f1920ae7c4
5 changed files with 173 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-world/examples/tick-tock/index.html Normal file
View File

@ -0,0 +1,6 @@
<html>
<head><title>My simple program</title></head>
<body>
<p>The current counter is: <span id="counter">fill-me-in</span></p>
</body>
</html>

20
web-world/examples/tick-tock/tick-tock.rkt Normal file
View File

@ -0,0 +1,20 @@
#lang planet dyoo/whalesong
(require (planet dyoo/whalesong/web-world)
(planet dyoo/whalesong/resource))
(define-resource index.html)
;; draw: world view -> view
(define (draw w v)
v
;(view-text (view-focus v "#counter") w)
)
;; tick: world view -> world
(define (tick w v)
(add1 w))
(big-bang 0
(initial-view index.html)
(to-draw draw)
(on-tick tick 1))

14
web-world/impl.rkt
View File

@ -9,6 +9,18 @@
#:racket "racket-impl.rkt"
#:javascript ("js-impl.js")
#:provided-values (big-bang
;; initial view
initial-view
;; stop-when handler
stop-when
on-tick))
;; clock tick handler
on-tick
;; draw and update the view
to-draw
;; coerse to view
->view))

141
web-world/js-impl.js
View File

@ -17,18 +17,18 @@
// A View represents a functional representation of the DOM tree.
var View = function(top, focused, eventSources, pendingActions) {
var View = function(top, focused, eventHandlers, pendingActions) {
// top: dom node
this.top = top;
this.focused = focused;
this.eventSources = eventSources;
this.eventHandlers = eventHandlers;
this.pendingActions = pendingActions;
};
View.prototype.toString = function() { return "#<View>"; };
View.prototype.updateFocused = function(focused) {
return new View(this.top, focused, this.eventSources, this.pendingActions);
return new View(this.top, focused, this.eventHandlers, this.pendingActions);
};
View.prototype.initialRender = function(top) {
@ -46,8 +46,8 @@
// Return a list of the event sources from the view.
// fixme: may need to apply the pending actions to get the real set.
View.prototype.getEventSources = function() {
return this.eventSources;
View.prototype.getEventHandlers = function() {
return this.eventHandlers;
};
@ -135,6 +135,19 @@
var ToDrawHandler = function(toDraw) {
WorldHandler.call(this);
// toDraw: Racket procedure (World View -> View)
this.toDraw = toDraw;
};
ToDrawHandler.prototype = plt.baselib.heir(WorldHandler.prototype);
ToDrawHandler.prototype.toString = function() { return "#<to-draw>"; };
var isToDrawHandler = plt.baselib.makeClassPredicate(ToDrawHandler);
var EventHandler = function(name, eventSource, racketWorldCallback) {
WorldHandler.call(this);
@ -159,6 +172,17 @@
return undefined;
};
var filter = function(handlers, pred) {
var i, lst = [];
for (i = 0; i < handlers.length; i++) {
if (pred(handlers[i])) {
lst.push(handlers[i]);
}
}
return lst;
};
@ -247,31 +271,74 @@
var defaultToDraw = function(world, view, success, fail) {
return success(view);
};
var defaultStopWhen = function(world, success, fail) {
return success(false);
};
// bigBang.
var bigBang = function(MACHINE, world, handlers) {
var oldArgcount = MACHINE.argcount;
var worldSetter = function(v) { world = v; };
var worldGetter = function(v) { return world; };
var view = find(handlers, isInitialViewHandler).view;
var stopWhen = find(handlers, isInitialViewHandler).stopWhen;
var defaultView = new View(plt.baselib.format.toDomNode(world),
[],
[],
[]);
var view = (find(handlers, isInitialViewHandler) || { view : defaultView}).view;
var stopWhen = (find(handlers, isStopWhenHandler) || { stopWhen: defaultStopWhen }).stopWhen;
var toDraw = (find(handlers, isToDrawHandler) || {toDraw : defaultToDraw} ).toDraw;
var eventQueue = [];
var top = $("<div/>");
MACHINE.params.currentDisplayer(MACHINE, top);
PAUSE(function(restart) {
var onRestart = function() {
var i;
for (i = 0; i < eventHandlers.length; i++) {
stopEventHandler(eventHandlers[i]);
}
restart(function(MACHINE) {
MACHINE.argcount = oldArgcount;
finalizeClosureCall(MACHINE, "ok");
finalizeClosureCall(MACHINE, world);
});
};
var startEventHandler = function(handler) {
var fireEvent = function() {
var args = [].slice.call(arguments, 0);
eventQueue.push({ handler : handler, data : args });
//
// fixme: if we see too many events accumulating, throttle
// the ones that are marked as throttleable.
};
handler.eventSource.onStart(fireEvent);
};
var stopEventHandler = function(handler) {
handler.eventSource.onStop();
};
view.initialRender(top);
var eventHandlers = filter(handlers, isEventHandler).concat(view.getEventHandlers());
var i;
for (i = 0; i < eventHandlers.length; i++) {
startEventHandler(eventHandlers[i]);
}
// fixme: set up the event sources
// fixme: set up the world updater
// fixme: re-render the view on world changes.
@ -284,11 +351,25 @@
});
};
var wrapFunction = function(proc) {
return function(MACHINE) {
var success = arguments[arguments.length - 2];
var fail = arguments[arguments.length - 1];
var args = [].slice.call(arguments, 0, arguments.length - 2);
return plt.baselib.functions.internalCallDuringPause.apply(null,
[MACHINE,
proc,
success,
fail].concat(args));
};
};
//////////////////////////////////////////////////////////////////////
var checkReal = plt.baselib.check.checkReal;
var checkProcedure = plt.baselib.check.checkProcedure;
var checkResourceOrView = plt.baselib.check.makeCheckArgumentType(
@ -345,23 +426,55 @@
});
EXPORTS['->view'] = makeClosure(
'->view',
1,
function(MACHINE) {
var oldArgcount = MACHINE.argcount;
PAUSE(function(restart) {
coerseToView(viewable,
function(v) {
restart(function(MACHINE) {
MACHINE.argcount = oldArgcount;
finalizeClosureCall(MACHINE, v);
});
},
function(exn) {
restart(function(MACHINE) {
plt.baselib.exceptions.raise(
MACHINE,
new Error(plt.baselib.format.format(
"unable to translate ~s to view: ~a",
[viewable, exn.message])));
});
});
});
});
EXPORTS['stop-when'] = makePrimitiveProcedure(
'stop-when',
1,
function(MACHINE) {
var stopWhen = checkProcedure(MACHINE, 'stop-when', 0);
var stopWhen = wrapFunction(checkProcedure(MACHINE, 'stop-when', 0));
return new StopWhenHandler(stopWhen);
});
EXPORTS['to-draw'] = makePrimitiveProcedure(
'to-draw',
1,
function(MACHINE) {
var toDraw = wrapFunction(checkProcedure(MACHINE, 'to-draw', 0));
return new ToDrawHandler(toDraw);
});
EXPORTS['on-tick'] = makePrimitiveProcedure(
'on-tick',
plt.baselib.lists.makeList(1, 2),
function(MACHINE) {
var onTick = checkProcedure(MACHINE, 'on-tick', 0);
var onTick = wrapFunction(checkProcedure(MACHINE, 'on-tick', 0));
var delay = Math.floor(1000/28);
if (MACHINE.argcount === 2) {
delay = plt.baselib.numbers.toFixnum(checkReal(MACHINE, 'on-tick', 1));
delay = Math.floor(plt.baselib.numbers.toFixnum(checkReal(MACHINE, 'on-tick', 1)) * 1000);
}
return new EventHandler('on-tick',
new TickEventSource(delay),

8
web-world/racket-impl.rkt
View File

@ -1,6 +1,6 @@
#lang racket/base
(provide big-bang initial-view stop-when on-tick)
(provide big-bang initial-view stop-when on-tick to-draw ->view)
(define (big-bang world . handlers)
(error 'big-bang "Please run in JavaScript context."))
@ -16,3 +16,9 @@
(error 'on-tick "Please run in JavaScript context.")]
[(f delay)
(error 'on-tick "Please run in JavaScript context.")]))
(define (to-draw w)
(error 'to-draw "Please run in JavaScript context."))
(define (->view x)
(error '->view "Please run in JavaScript context."))