PIU: avoid Desktop/Mobile conflicts + iOS layers

Author: Patrick Soquet

modules/piu/All/piuAll.js

@@ -23,10 +23,15 @@
 // PiuColor.c
 
 export function blendColors(a, c1, c2) @ "Piu_blendColors";
+global.blendColors = blendColors;
 export function hsl(r, g, b) @ "Piu_hsl";
+global.hsl = hsl;
 export function hsla(r, g, b, a) @ "Piu_hsla";
+global.hsla = hsla;
 export function rgb(r, g, b) @ "Piu_rgb";
+global.rgb = rgb;
 export function rgba(r, g, b, a) @ "Piu_rgba";
+global.rgba = rgba;
 
 // PiuSkin.c
 
@@ -66,6 +71,7 @@ export class Skin @ "PiuSkinDelete" {
 	}
 }
 Object.freeze(Skin.prototype);
+global.Skin = Skin;
 
 // PiuStyle.c
 
@@ -105,6 +111,7 @@ export class Style @ "PiuStyleDelete" {
 	}
 }
 Object.freeze(Style.prototype);
+global.Style = Style;
 
 // BEHAVIOR
 
@@ -113,6 +120,7 @@ export class Behavior {
 	}
 }
 Object.freeze(Behavior.prototype);
+global.Behavior = Behavior;
 
 // DISPATCH
 
@@ -140,6 +148,7 @@ export function template(f) {
 	result.template = template;
 	return result;
 }
+global.template = template;
 
 export function Template(prototype) {
 	let result = function($, it = {}) {
@@ -151,6 +160,7 @@ export function Template(prototype) {
 	result.template = template;
 	return result;
 }
+global.Template = Template;
 
 // CONTENTS
 
@@ -235,6 +245,7 @@ export let Content = Template(Object.freeze({
 	start() @ "PiuContent_start",
 	stop() @ "PiuContent_stop",
 }));
+global.Content = Content;
 
 // PiuLabel.c
 
@@ -246,6 +257,7 @@ export let Label = Template(Object.freeze({
 
 	set string(it) @ "PiuLabel_set_string",
 }));
+global.Label = Label;
 
 // PiuText.c
 
@@ -267,6 +279,7 @@ export let Text = Template(Object.freeze({
 	endBlock() @ "PiuText_endBlock",
 	endSpan() @ "PiuText_endSpan",
 }));
+global.Text = Text;
 
 export let Link = Template(Object.freeze({
 	__proto__: proto,
@@ -279,6 +292,7 @@ export let Link = Template(Object.freeze({
 
 	captureTouch(id, x, y, ticks) @ "PiuContent_captureTouch",
 }));
+global.Link = Link;
 
 // PiuPort.c
 
@@ -303,6 +317,7 @@ export let Port = Template(Object.freeze({
 	pushClip(x, y, w, h) @ "PiuPort_pushClip",
 	measureString(string, style) @ "PiuPort_measureString",
 }));
+global.Port = Port;
 
 // CONTAINERS
 
@@ -341,27 +356,31 @@ export let Container = Template(Object.freeze({
 	run(transition) @ "PiuContainer_run",
 	swap(content0, content1) @ "PiuContainer_swap",
 }));
+global.Container = Container;
 
 // PiuColumn.c
 
 export let Column = Template(Object.freeze({
 	__proto__: Container.prototype,
 	_create($, it) @ "PiuColumn_create",
 }));
+global.Column = Column;
 
 // PiuLayout.c
 
 export let Layout = Template(Object.freeze({
 	__proto__: Container.prototype,
 	_create($, it) @ "PiuLayout_create",
 }));
+global.Layout = Layout;
 
 // PiuRow.c
 
 export let Row = Template(Object.freeze({
 	__proto__: Container.prototype,
 	_create($, it) @ "PiuRow_create",
 }));
+global.Row = Row;
 
 // PiuScroller.c
 
@@ -382,13 +401,15 @@ export let Scroller = Template(Object.freeze({
 	scrollBy(dx, dy) @ "PiuScroller_scrollBy",
 	scrollTo(x, y) @ "PiuScroller_scrollTo",
 }));
+global.Scroller = Scroller;
 
 // DEFER
 
 export class DeferLink @ "PiuDeferLinkDelete" {
 	constructor() @ "PiuDeferLinkCreate"
 }
 Object.freeze(DeferLink.prototype);
+global.DeferLink = DeferLink;
 
 // TOUCH
 
@@ -398,6 +419,7 @@ export class TouchLink @ "PiuTouchLinkDelete" {
 	peek(index) @ "PiuTouchLink_peek"
 }
 Object.freeze(TouchLink.prototype);
+global.TouchLink = TouchLink;
 
 // TRANSITION
 
@@ -418,6 +440,7 @@ export class Transition @ "PiuTransitionDelete" {
 	}
 }
 Object.freeze(Transition.prototype);
+global.Transition = Transition;
 
 // LOCALS
 
@@ -430,6 +453,7 @@ export class Locals  @ "PiuLocalsDelete" {
 	get(id) @ "PiuLocals_get"
 }
 Object.freeze(Locals.prototype);
+global.Locals = Locals;
 
 Math.backEaseIn = function(fraction) @ "Math_backEaseIn";
 Math.backEaseInOut = function(fraction) @ "Math_backEaseInOut";

modules/piu/All/piuStyle.c

@@ -109,7 +109,8 @@ PiuStyle* PiuStyleLinkCompute(xsMachine *the, PiuStyleLink* chain, PiuApplicatio
 	PiuStyle* result = (*chain)->computedStyle;
 	if (result == NULL) {
 		PiuStyleLink* link = chain;
-		xsResult = xsNewFunction0((*application)->Style);
+		xsResult = xsGet(xsGlobal, xsID_Style);
+		xsResult = xsNewFunction0(xsResult);
 		result = PIU(Style, xsResult);
 		while (link) {
 			PiuStyleOverride((*link)->style, result);
@@ -487,8 +488,6 @@ void PiuStyleOverride(PiuStyle* self, PiuStyle* result)
 	}
 }
 
-
-
 void PiuStyle_get_bottom(xsMachine* the)
 {
 	PiuStyle* self = PIU(Style, xsThis);

modules/piu/MC/piuDie.c

@@ -18,7 +18,6 @@
  *
  */
 
-#include "piuAll.h"
 #include "piuMC.h"
 
 static void PiuDieUpdate(void* it, PiuView* view, PiuRectangle area);

modules/piu/MC/piuFont.c

@@ -18,7 +18,6 @@
  *
  */
 
-#include "piuAll.h"
 #include "piuMC.h"
 
 static void PiuFontDelete(void* it);

modules/piu/MC/piuImage.c

@@ -18,7 +18,6 @@
  *
  */
 
-#include "piuAll.h"
 #include "piuMC.h"
 
 static void PiuImageDictionary(xsMachine* the, void* it);

modules/piu/MC/piuMC.h

@@ -18,6 +18,8 @@
  *
  */
 
+#include "piuAll.h"
+
 typedef struct PiuDieStruct PiuDieRecord, *PiuDie;
 typedef struct PiuImageStruct PiuImageRecord, *PiuImage;
 typedef struct PiuRegionStruct PiuRegionRecord, *PiuRegion;

modules/piu/MC/piuMC.js

@@ -24,32 +24,7 @@ import parseRLE from "commodetto/ParseRLE";
 import Poco from "commodetto/Poco";
 import Resource from "Resource";
 
-import { 
-	blendColors,
-	hsl,
-	hsla,
-	rgb,
-	rgba,
-	Skin,
-	Style,
-	Behavior,
-	Transition,
-	template,
-	Template,
-	Content,
-	Label,
-	Text,
-	Link,
-	Port,
-	Container,
-	Column,
-	Layout,
-	Row,
-	Scroller,
-	DeferLink,
-	TouchLink,
-	Locals,
-} from "All";
+import {} from "All";
 export * from "All";
 
 export class CLUT extends Resource {
@@ -59,6 +34,7 @@ export class CLUT extends Resource {
 	get colors() @ "PiuCLUT_get_colors"
 }
 Object.freeze(CLUT.prototype);
+global.CLUT = CLUT;
 
 // PiuTexture.c
 
@@ -115,6 +91,7 @@ export class Texture @ "PiuTextureDelete" {
 	}
 }
 Object.freeze(Texture.prototype);
+global.Texture = Texture;
 
 // PiuDie.c
 
@@ -134,6 +111,7 @@ var die = {
 };
 export var Die = Template(die);
 Object.freeze(die);
+global.Die = Die;
 
 // PiuImage.c
 
@@ -148,6 +126,7 @@ var image = {
 };
 export var Image = Template(image);
 Object.freeze(image);
+global.Image = Image;
 
 // PiuApplication.c
 
@@ -180,6 +159,7 @@ export function Application($, it = {}) {
 Application.prototype = application;
 Application.template = template;
 Object.freeze(application);
+global.Application = Application;
 
 // PiuView.c
 
@@ -206,34 +186,10 @@ class View @ "PiuViewDelete" {
 }
 Object.freeze(View.prototype);
 
-global.blendColors = blendColors;
-global.hsl = hsl;
-global.hsla = hsla;
-global.rgb = rgb;
-global.rgba = rgba;
 
-global.Skin = Skin;
-global.Style = Style;
-global.Behavior = Behavior;
-global.Transition = Transition;
 
-global.Content = Content;
-global.Label = Label;
-global.Port = Port;
-global.Text = Text;
-global.Link = Link;
 
-global.Container = Container;
-global.Column = Column;
-global.Layout = Layout;
-global.Row = Row;
-global.Scroller = Scroller;
 
 
-global.Locals = Locals;
-global.Texture = Texture;
 
-global.Die = Die;
-global.Image = Image;
 
-global.Application = Application;

modules/piu/MC/piuRegion.c

@@ -18,7 +18,6 @@
  *
  */
 
-#include "piuAll.h"
 #include "piuMC.h"
 
 static PiuBoolean SpanEquals(PiuCoordinate* former, PiuCoordinate* current);

modules/piu/MC/piuSound.c

@@ -18,7 +18,6 @@
  *
  */
 
-#include "piuAll.h"
 #include "piuMC.h"
 #include "mc.defines.h"
 

modules/piu/MC/piuTexture.c

@@ -18,7 +18,6 @@
  *
  */
 
-#include "piuAll.h"
 #include "piuMC.h"
 
 static void PiuTextureMark(xsMachine* the, void* it, xsMarkRoot markRoot);