Skip to content

Commit 8d1708c

Browse files
livecodesebastienlivecodesebastien
committed
Merge branch 'develop' into refactor-syntax_unicode (first shot)
Conflicts: builder/tools_builder.rev engine/Android.mk engine/Makefile.kernel engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/kernel.vcproj engine/src/MCBlock.h engine/src/aclip.cpp engine/src/block.cpp engine/src/button.cpp engine/src/button.h engine/src/buttondraw.cpp engine/src/card.cpp engine/src/chunk.cpp engine/src/cmds.h engine/src/cmdsc.cpp engine/src/context.h engine/src/dispatch.cpp engine/src/dispatch.h engine/src/dskmain.cpp engine/src/dskosxmain.mm engine/src/executionerrors.h engine/src/field.h engine/src/fieldf.cpp engine/src/fieldrtf.cpp engine/src/fields.cpp engine/src/fieldstyledtext.cpp engine/src/font.cpp engine/src/font.h engine/src/globals.cpp engine/src/graphic.cpp engine/src/graphic.h engine/src/graphicscontext.cpp engine/src/graphicscontext.h engine/src/group.cpp engine/src/hc.cpp engine/src/hc.h engine/src/line.cpp engine/src/line.h engine/src/lnxdclnx.cpp engine/src/lnxdcs.cpp engine/src/lnximage.cpp engine/src/lnxpsprinter.cpp engine/src/mac-scripting.mm engine/src/mblandroidfont.cpp engine/src/mblandroidmisc.cpp engine/src/mblandroidstore.cpp engine/src/mblflst.cpp engine/src/mbliphone.mm engine/src/mbliphonedc.mm engine/src/mbliphoneextra.mm engine/src/mbliphonestore.mm engine/src/mblstore.cpp engine/src/mblstore.h engine/src/mcio.cpp engine/src/menuparse.cpp engine/src/menuparse.h engine/src/metacontext.cpp engine/src/metacontext.h engine/src/mode_installer.cpp engine/src/mode_standalone.cpp engine/src/object.cpp engine/src/opensslsocket.cpp engine/src/osxans.mm engine/src/osxansold.cpp engine/src/osxclipboard.cpp engine/src/osxcolor.cpp engine/src/osxcursor.mm engine/src/osxdc.cpp engine/src/osxdc.h engine/src/osxdce.mm engine/src/osxdcmac.cpp engine/src/osxdcs.cpp engine/src/osxdnd.cpp engine/src/osxfiles.cpp engine/src/osxflst.cpp engine/src/osxhighdpi.mm engine/src/osxicon.cpp engine/src/osxmisc.cpp engine/src/osxprinter.cpp engine/src/osxscriptold.cpp engine/src/osxsnapshot.mm engine/src/osxstack.cpp engine/src/osxtransfer.h engine/src/osxtransfer.mm engine/src/paragraf.cpp engine/src/paragraf.h engine/src/paragrafattr.cpp engine/src/parsedef.h engine/src/parseerrors.h engine/src/player.cpp engine/src/player.h engine/src/property.cpp engine/src/scrolbar.cpp engine/src/scrollbardraw.cpp engine/src/socket.h engine/src/stack.cpp engine/src/stacklst.cpp engine/src/stacklst.h engine/src/sysdefs.h engine/src/sysspec.cpp engine/src/tooltip.cpp engine/src/transfer.cpp engine/src/typedefs.h engine/src/uidc.cpp engine/src/uidc.h engine/src/util.cpp engine/src/w32dce.cpp engine/src/w32dcs.cpp engine/src/w32spec.cpp engine/src/w32stack.cpp ide libgraphics/include/graphics.h libgraphics/libgraphics-mobile.xcodeproj/project.pbxproj libgraphics/libgraphics.xcodeproj/project.pbxproj libgraphics/src/context.cpp libgraphics/src/w32text.cpp prebuilt revbrowser/revbrowser.vcproj revbrowser/revbrowser.xcodeproj/project.pbxproj rules/Debug.xcconfig stage.sln thirdparty tools/build_libinfo.lc tools/weak_stub_maker.lc version
2 parents fd77a4e + 974cd9d commit 8d1708c

File tree

470 files changed

+57253
-5337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

470 files changed

+57253
-5337
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ engine/src/hashedstrings.cpp
55
engine/src/encodederrors.cpp
66
engine/src/startupstack.cpp
77
engine/src/linuxstubs.cpp
8+
engine/src/quicktimestubs.mac.cpp
89
engine/include/revbuild.h
910
lcidlc/src/EncodedSupport.c
1011
lcidlc/src/EncodedJavaSupport.c

‎builder/package_compiler.rev‎

52 Bytes
Binary file not shown.

‎docs/dictionary/command/mobileStoreConfirmPurchase.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>mobileStoreConfirmPurchase</name> <type>command</type> <syntax> <example>mobileStoreConfirmPurchase <i>productID</i></example> </syntax> <synonyms> </synonyms> <summary>Inform the store that the purchase identifier <i>productID</i> was successfully delivered.</summary> <examples><example><p>on purchaseStateUpdate pPurchaseID, pProductID, pState</p><p> switch pState</p><p> case "paymentReceived"</p><p> offerPurchasedItem pProductID</p><p> mobileStoreConfirmPurchase pProductID</p><p> mobileStoreDisablePurchaseUpdates</p><p> </p><p> case "error"</p><p> ...</p><p> mobileStoreDisablePurchaseUpdates</p><p> </p><p> case "invalidSKU"</p><p> ...</p><p> mobileStoreDisablePurchaseUpdates</p><p> </p><p> case "alreadyEntitled"</p><p> ...</p><p> mobileStoreDisablePurchaseUpdates</p><p> </p><p> case "restored"</p><p> offerPurchasedItem pProductID </p><p> mobileStoreConfirmPurchase pProductID</p><p> mobileStoreDisablePurchaseUpdates</p><p> </p><p> case "cancelled"</p><p> ...</p><p> mobileStoreDisablePurchaseUpdates</p><p> </p><p> end switch</p><p>end purchaseStateUpdate</p></example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> </platforms> <classes> </classes> <security> </security> <classification> </classification> <references> <function tag="mobileStoreCanMakePurchase">mobileStoreCanMakePurchase function</function> <function tag="mobileStorePurchaseError">mobileStorePurchaseError function</function> <function tag="mobileStoreProductProperty">mobileStoreProductProperty function</function> <function tag="mobileStorePurchasedProducts">mobileStorePurchasedProducts function</function> <command tag="mobileStoreEnablePurchaseUpdates">mobileStoreEnablePurchaseUpdates command</command> <command tag="mobileStoreDisablePurchaseUpdates">mobileStoreDisablePurchaseUpdates command</command> <command tag="mobileStoreRestorePurchases">mobileStoreRestorePurchases command</command> <command tag="mobileStoreConsumePurchase">mobileStoreConsumePurchase command</command> <command tag="mobileStoreSetProductType">mobileStoreSetProductType command</command> <command tag="mobileStoreRequestProductDetails">mobileStoreRequestProductDetails command</command> <command tag="mobileStoreMakePurchase">mobileStoreMakePurchase command</command> <command tag="mobileStoreVerifyPurchase">mobileStoreVerifyPurchase command</command> <message tag="purchaseStateUpdate">purchaseStateUpdate message</message> <message tag="productDetailsReceived">productDetailsReceived message</message> <message tag="productRequestError">productRequestError message</message> </references> <description> <overview>Use the <b>mobileStoreConfirmPurchase</b> command to notify the store that a purchase was successfully delivered.</overview> <parameters> <parameter> <name>productID</name> <description>Is the identifier of the product for which you want to inform the store that it was successfully delivered.</description> </parameter> </parameters> <value></value> <comments>The command <b>mobileStoreConfirmPurchase</b> is used to notify the store that a purchase was successfully delivered. This informs the store to stop sending In that way, the store stops sending <message tag="purchaseStateUpdate">purchaseStateUpdate</message> messages.<p></p><p></p><p></p><note> This function is used for iOS, but it is a good practice to use it for any store. This command should only be called in the "paymentReceived" or "restored" state, see example. If you call <command tag="mobileStoreDisablePurchaseUpdates">mobileStoreDisablePurchaseUpdates</command> without first calling mobileStoreConfirmPurchase, then you receive a <message tag="purchaseStateUpdate">purchaseStateUpdate</message> message with state "paymentReceived" or "restored", the next time you call <command tag="mobileStoreEnablePurchaseUpdates">mobileStoreEnablePurchaseUpdates</command>.</note><p>&#9;</p></comments> </description></doc>

‎docs/dictionary/command/mobileStoreConsumePurchase.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>mobileStoreConsumePurchase</name> <type>command</type> <syntax> <example>mobileStoreConsumePurchase <i>productID</i></example> </syntax> <synonyms> </synonyms> <summary>Consume a purchased item.</summary> <examples><example>mobileStoreConsumePurchase "com.runrev.sampleapp.consumable" </example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <ios/> <android/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <function tag="mobileStoreCanMakePurchase">mobileStoreCanMakePurchase function</function> <function tag="mobileStorePurchaseError">mobileStorePurchaseError function</function> <function tag="mobileStorePurchasedProducts">mobileStorePurchasedProducts function</function> <function tag="mobileStoreProductProperty">mobileStoreProductProperty function</function> <command tag="mobileStoreEnablePurchaseUpdates">mobileStoreEnablePurchaseUpdates command</command> <command tag="mobileStoreDisablePurchaseUpdates">mobileStoreDisablePurchaseUpdates command</command> <command tag="mobileStoreRestorePurchases">mobileStoreRestorePurchases command</command> <command tag="mobileStoreConfirmPurchase">mobileStoreConfirmPurchase command</command> <command tag="mobileStoreSetProductType">mobileStoreSetProductType command</command> <command tag="mobileStoreRequestProductDetails">mobileStoreRequestProductDetails command</command> <command tag="mobileStoreMakePurchase">mobileStoreMakePurchase command</command> <command tag="mobileStoreVerifyPurchase">mobileStoreVerifyPurchase command</command> <message tag="purchaseStateUpdate">purchaseStateUpdate message</message> <message tag="productDetailsReceived">productDetailsReceived message</message> <message tag="productRequestError">productRequestError message</message> </references> <description> <overview>Use the <b>mobileStoreConsumePurchase</b> function to consume a purchased item.</overview> <parameters> <parameter> <name>productID</name> <description>Is the identifier of the requested product.</description> </parameter> </parameters> <value></value> <comments>The command <b>mobileStoreConsumePurchase</b> is used to consume a purchased item. This removes the item from the user's inventory.<p></p><p></p><note> This command is only used when interacting with Google Play Store in-app purchasing API. This is due to a Google API restriction that ensures a consumable product is consumed before another instance is purchased. <i>Consume</i> means that the purchase is removed from the user's inventory of purchased items, allowing the user buy that product again.</note><p></p><p></p><note> This command must only be called on consumable products. If you call mobileStoreConsumePurchase on a non-consumable product, then you no longer own that product.</note></comments> </description></doc>

‎docs/dictionary/command/mobileStoreDisablePurchaseUpdates.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>mobileStoreDisablePurchaseUpdates</name> <type>command</type> <syntax> <example>mobileStoreDisablePurchaseUpdates</example> </syntax> <synonyms> <synonym>mobileDisablePurchaseUpdates</synonym> </synonyms> <summary>Disables the receipt of purchaseStateUpdate messages.</summary> <examples><example><p>on purchaseStateUpdate pPurchaseID, pProductID, pState</p><p> switch pState</p><p> ...</p><p> end switch </p><p> mobileStoreDisablePurchaseUpdates </p><p>end purchaseStateUpdate</p></example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <ios/> <android/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <function tag="mobileStoreCanMakePurchase">mobileStoreCanMakePurchase function</function> <function tag="mobileStorePurchasedProducts">mobileStorePurchasedProducts function</function> <function tag="mobileStorePurchaseError">mobileStorePurchaseError function</function> <function tag="mobileStoreProductProperty">mobileStoreProductProperty function</function> <command tag="mobileStoreEnablePurchaseUpdates">mobileStoreEnablePurchaseUpdates command</command> <command tag="mobileStoreRestorePurchases">mobileStoreRestorePurchases command</command> <command tag="mobileStoreConfirmPurchase">mobileStoreConfirmPurchase command</command> <command tag="mobileStoreConsumePurchase">mobileStoreConsumePurchase command</command> <command tag="mobileStoreSetProductType">mobileStoreSetProductType command</command> <command tag="mobileStoreMakePurchase">mobileStoreMakePurchase command</command> <command tag="mobileStoreVerifyPurchase">mobileStoreVerifyPurchase command</command> <command tag="mobileStoreRequestProductDetails">mobileStoreRequestProductDetails command</command> <message tag="purchaseStateUpdate">purchaseStateUpdate message</message> <message tag="productDetailsReceived">productDetailsReceived message</message> <message tag="productRequestError">productRequestError message</message> </references> <description> <overview>Use the <b>mobileStoreDisablePurchaseUpdates</b> command to disable the receipt of <message tag="purchaseStateUpdate">purchaseStateUpdate</message> messages.</overview> <parameters> </parameters> <value></value> <comments>The command <b>mobileStoreDisablePurchaseUpdates</b> is used to disable the receipt of purchaseStateUpdate messages from the store. This command is typically used in <message tag="purchaseStateUpdate">purchaseStateUpdate</message> message, after processing each message that is sent by the store.<p></p><p></p><p></p><note> This command is used when interacting with the Apple AppStore, however, we suggest using it for every store. Failure to use this command results in continuing to receive <message tag="purchaseStateUpdate">purchaseStateUpdate</message> messages from the AppStore.</note><p>&#9;</p></comments> </description></doc>

‎docs/dictionary/command/mobileStoreEnablePurchaseUpdates.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>mobileStoreEnablePurchaseUpdates</name> <type>command</type> <syntax> <example>mobileStoreEnablePurchaseUpdates</example> </syntax> <synonyms> <synonym>mobileEnablePurchaseUpdates</synonym> </synonyms> <summary>Enables the receipt of purchaseStateUpdate messages.</summary> <examples><example><p>on mouseUp</p><p> mobileStoreEnablePurchaseUpdates</p><p> mobileStoreSetProductType "com.runrev.sampleapp.nonconsumable", "inapp"</p><p> mobileStoreMakePurchase "com.runrev.sampleapp.nonconsumable", "1", "This belongs to me"</p><p>end mouseUp</p></example><example><p>on mouseUp</p><p> mobileStoreEnablePurchaseUpdates</p><p> mobileStoreRestorePurchases</p><p>end mouseUp</p></example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <ios/> <android/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <function tag="mobileStoreCanMakePurchase">mobileStoreCanMakePurchase function</function> <function tag="mobileStorePurchasedProducts">mobileStorePurchasedProducts function</function> <function tag="mobileStorePurchaseError">mobileStorePurchaseError function</function> <function tag="mobileStoreProductProperty">mobileStoreProductProperty function</function> <command tag="mobileStoreDisablePurchaseUpdates">mobileStoreDisablePurchaseUpdates command</command> <command tag="mobileStoreRestorePurchases">mobileStoreRestorePurchases command</command> <command tag="mobileStoreConfirmPurchase">mobileStoreConfirmPurchase command</command> <command tag="mobileStoreConsumePurchase">mobileStoreConsumePurchase command</command> <command tag="mobileStoreSetProductType">mobileStoreSetProductType command</command> <command tag="mobileStoreMakePurchase">mobileStoreMakePurchase command</command> <command tag="mobileStoreVerifyPurchase">mobileStoreVerifyPurchase command</command> <command tag="mobileStoreRequestProductDetails">mobileStoreRequestProductDetails command</command> <message tag="purchaseStateUpdate">purchaseStateUpdate message</message> <message tag="productDetailsReceived">productDetailsReceived message</message> <message tag="productRequestError">productRequestError message</message> </references> <description> <overview>Use the <b>mobileStoreEnablePurchaseUpdates</b> command to enable the receipt of <message tag="purchaseStateUpdate">purchaseStateUpdate</message> messages.</overview> <parameters> </parameters> <value></value> <comments>The command <b>mobileStoreEnablePurchaseUpdates</b> is used to enable the receipt of <message tag="purchaseStateUpdate">purchaseStateUpdate</message> messages from the store.<p></p><p></p><p></p><note> This command is necessary when interacting with Apple AppStore, however, we suggest using it for every store. Failure to use this command result in your purchase requests not being processed. </note><p>&#9;</p></comments> </description></doc>

‎docs/dictionary/command/mobileStoreMakePurchase.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>mobileStoreMakePurchase</name> <type>command</type> <syntax> <example>mobileStoreMakePurchase <i>productID, quantity, developerPayload</i></example> </syntax> <synonyms> </synonyms> <summary>Create and send a request for a new purchase.</summary> <examples><example><p>mobileStoreMakePurchase "com.runrev.sampleapp.consumable", "1", "This belongs to me"</p><p></p></example><example><p>on buyConsumableProduct </p><p> mobileStoreEnablePurchaseUpdates</p><p> mobileStoreSetProductType "com.runrev.sampleapp.consumable", "inapp"</p><p> mobileStoreMakePurchase "com.runrev.sampleapp.consumable", "1", "This belongs to me"</p><p>end buyConsumableProduct </p></example><example><p>on buySubscriptionProduct </p><p> mobileStoreEnablePurchaseUpdates</p><p> mobileStoreSetProductType "com.runrev.sampleapp.subscription", "subs"</p><p> mobileStoreMakePurchase "com.runrev.sampleapp.subscription", "1", "This belongs to me"</p><p>end buySubscriptionProduct</p></example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <ios/> <android/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <command tag="mobileStoreSetProductType">mobileStoreSetProductType command</command> <function tag="mobileStoreCanMakePurchase">mobileStoreCanMakePurchase function</function> <function tag="mobileStorePurchasedProducts">mobileStorePurchasedProducts function</function> <function tag="mobileStorePurchaseError">mobileStorePurchaseError function</function> <function tag="mobileStoreProductProperty">mobileStoreProductProperty function</function> <command tag="mobileStoreEnablePurchaseUpdates">mobileStoreEnablePurchaseUpdates command</command> <command tag="mobileStoreDisablePurchaseUpdates">mobileStoreDisablePurchaseUpdates command</command> <command tag="mobileStoreRestorePurchases">mobileStoreRestorePurchases command</command> <command tag="mobileStoreConfirmPurchase">mobileStoreConfirmPurchase command</command> <command tag="mobileStoreConsumePurchase">mobileStoreConsumePurchase command</command> <command tag="mobileStoreVerifyPurchase">mobileStoreVerifyPurchase command</command> <command tag="mobileStoreRequestProductDetails">mobileStoreRequestProductDetails command</command> <message tag="purchaseStateUpdate">purchaseStateUpdate message</message> <message tag="productDetailsReceived">productDetailsReceived message</message> <message tag="productRequestError">productRequestError message</message> </references> <description> <overview>Use the <b>mobileStoreMakePurchase</b> command to create and send a request for a new purchase.</overview> <parameters> <parameter> <name>productID</name> <description>Is the identifier of the requested item.</description> </parameter> <parameter> <name>quantity</name> <description>Is the quantity of the in-app purchase to buy.</description> </parameter> <parameter> <name>developerPayload</name> <description>Is a string of less than 256 characters that is returned with the purchase details once the transaction is complete. It can later be used to identify a purchase response to a specific request. </description> </parameter> </parameters> <value></value> <comments>The command <b>mobileStoreMakePurchase</b> is used to create and send a request for a new purchase.<p></p><p>The <i>productID </i>is the identifier of the in-app purchase you created and wish to buy in the vendor's App Store.</p><p>The <i>quantity</i> is the the quantity of the in-app purchase to buy. This is used for iOS, and should be used on consumable items. For Android, you must set the <i>quantity</i> to "1". If you want to buy more than one consumable item, you have to purchase them one at a time.</p><p>The <i>developerPayload</i> is a string that contains additional purchase information. This only is used for Android stores.</p><p></p><p></p><p></p><note> Before calling the <b>mobileStoreMakePurchase </b>command, set the product type using <command tag="mobileStoreSetProductType">mobileStoreSetProductType, and</command> enable receipt of the purchaseStateUpdate messages through <command tag="mobileStoreEnablePurchaseUpdates">mobileStoreEnablePurchaseUpdates</command>.</note><p>&#9;</p></comments> </description></doc>

0 commit comments

Comments
 (0)