Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 7dda82b

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop' into 6_7_dp_7_merge
Conflicts: engine/Android.mk engine/Makefile.kernel engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/kernel.vcproj engine/src/button.h engine/src/globals.cpp engine/src/globals.h engine/src/mode_development.cpp engine/src/mode_installer.cpp engine/src/mode_server.cpp engine/src/mode_standalone.cpp engine/src/osxfiles.cpp engine/src/sysdefs.h engine/src/w32spec.cpp ide libgraphics/src/legacygradients.cpp libgraphics/src/lnxtext.cpp libgraphics/src/w32text.cpp
2 parents f34fe64 + f7d1b04 commit 7dda82b

Some content is hidden

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

65 files changed

+6445
-867
lines changed

‎docs/dictionary/function/specialFolderPath.xml‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
<introduced version="1.1">Added.</introduced>
2626
<deprecated version=""></deprecated>
2727
<removed version=""></removed>
28-
<changed version="4.6.1">Added Android Support.</changed>
28+
<changed version="6.7.0">Added &quot;engine&quot; folder for Desktop platforms</changed>
29+
<changed version="4.6.1">Added Android Support.</changed>
2930
<changed version="5.5.3">5.5.3</changed>
3031
<changed version="4.5.2">Added iOS Support.</changed>
3132
<changed version="2.9">2.9</changed>
@@ -111,6 +112,10 @@
111112
<item>Temporary</item>
112113
<description>For storage of temporary files.</description>
113114
</option>
115+
<option>
116+
<item>Engine</item>
117+
<description>The folder containing the engine.</description>
118+
</option>
114119
</options>
115120
<options title="For Mac OS X systems:">
116121
<option>
@@ -149,6 +154,10 @@
149154
<item>Support</item>
150155
<description>For application data.</description>
151156
</option>
157+
<option>
158+
<item>Engine</item>
159+
<description>The folder containing the engine.</description>
160+
</option>
152161
</options>
153162
<options title="For Windows systems:">
154163
<option>
@@ -183,6 +192,10 @@
183192
<item>Support</item>
184193
<description>For CSIDL 0x1a (appdata folder) data.</description>
185194
</option>
195+
<option>
196+
<item>Engine</item>
197+
<description>The folder containing the engine.</description>
198+
</option>
186199
</options>
187200
<options title="Windows CSIDL numbers:">
188201
<option>
@@ -209,6 +222,10 @@
209222
<item>0x000a</item>
210223
<description>The recycle bin.</description>
211224
</option>
225+
<option>
226+
<item>Engine</item>
227+
<description>The folder containing the engine.</description>
228+
</option>
212229
</options>
213230
<options title="For Unix systems:">
214231
<option>
@@ -227,6 +244,10 @@
227244
<item>0x000e</item>
228245
<description>The "My Videos" folder.</description>
229246
</option>
247+
<option>
248+
<item>Engine</item>
249+
<description>The folder containing the engine.</description>
250+
</option>
230251
</options>
231252
<options title="For iOS systems:">
232253
<option>
@@ -271,6 +292,6 @@
271292
</parameter> </parameters>
272293

273294
<value>The <b>specialFolderPath</b> function returns a folder name and location.</value>
274-
<comments>If the folder is not found, the <b>specialFolderPath</b> function returns empty. If the <i>folderIdentifier</i> is either not supported on the current platform or doesn't exist on the current system, the result is set to "folder not found".<p>Some of the special folders you can specify with the <b>specialFolderPath</b> function need not have the standard names. (For example, the System Folder on Mac OS systems is not necessarily named "System Folder".) For this reason, the <b>specialFolderPath</b> function returns the full path to the folder, including the name of the folder.</p><p></p><p>If you are using the <b>specialFolderPath</b> on iOS, the you should only create files within the documents, cache and temporary folders. Be careful not to change or add any files within the application bundle. The application bundle is digitally signed when it is built, and any changes after this point will invalidate the signature and prevent it from launching.</p><p></p><p></p><note> Unlike (most) Mac OS X installs, the Android and iOS filesystems are case-sensitive.</note><p></p><p></p><note> The iOS simulator has the 'same' case-sensitivity as the host system and not the device.</note><p></p><p></p><change><p>Support for using the <b>specialFolderPath</b> function on Android systems was added in version 4.6.2.</change><p>Support for using the <b>specialFolderPath</b> function on iOS systems was added in version 4.5.2.</p><p>Support for using the <b>specialFolderPath</b> function on Unix systems was added in version 2.9.</p><p>Support for special folder constants (on Mac OS and OS X) and CSIDL numbers (on Windows) was added in version 2.0.</p><p>&#9;</p></comments>
295+
<comments>If the folder is not found, the <b>specialFolderPath</b> function returns empty. If the <i>folderIdentifier</i> is either not supported on the current platform or doesn't exist on the current system, the result is set to "folder not found".<p>Some of the special folders you can specify with the <b>specialFolderPath</b> function need not have the standard names. (For example, the System Folder on Mac OS systems is not necessarily named "System Folder".) For this reason, the <b>specialFolderPath</b> function returns the full path to the folder, including the name of the folder.</p><p></p><p>If you are using the <b>specialFolderPath</b> on iOS, the you should only create files within the documents, cache and temporary folders. Be careful not to change or add any files within the application bundle. The application bundle is digitally signed when it is built, and any changes after this point will invalidate the signature and prevent it from launching.</p><p></p><p></p><p></p><note>Unlike (most) Mac OS X installs, the Android and iOS filesystems are case-sensitive.</note><p></p><p></p><p></p><note>The iOS simulator has the 'same' case-sensitivity as the host system and not the device.</note><p></p><p></p><p></p><change><p>Support for using the <b>specialFolderPath</b> function on Android systems was added in version 4.6.2.</change><p>Support for using the <b>specialFolderPath</b> function on iOS systems was added in version 4.5.2.</p><p>Support for using the <b>specialFolderPath</b> function on Unix systems was added in version 2.9.</p><p>Support for special folder constants (on Mac OS and OS X) and CSIDL numbers (on Windows) was added in version 2.0.</p><p>&#9;</p><p>&#9;</p></comments>
275296
</description>
276297
</doc>

‎docs/dictionary/property/engine-folder.xml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<synonyms>
1111
</synonyms>
1212

13-
<summary>Returns the path to the engine folder on mobile devices.</summary>
13+
<summary>Returns the path to the engine folder.</summary>
1414

1515
<examples>
1616
<example>get the engine folder</example>
@@ -21,18 +21,25 @@
2121
<introduced version="5.0.2">Added.</introduced>
2222
<deprecated version=""></deprecated>
2323
<removed version=""></removed>
24-
24+
<changed version="6.7.0">Now supported on Desktop platforms</changed>
25+
<experimental version=""></experimental>
26+
<nonexperimental version=""></nonexperimental>
2527
</history>
2628

2729
<objects>
2830
</objects>
2931

3032
<platforms>
33+
<mac/>
34+
<windows/>
35+
<linux/>
3136
<ios/>
3237
<android/>
3338
</platforms>
3439

3540
<classes>
41+
<desktop/>
42+
<server/>
3643
<mobile/>
3744
</classes>
3845

@@ -58,6 +65,6 @@
5865
</parameters>
5966

6067
<value></value>
61-
<comments>On iOS <b>the engine folder </b>property returns the path to the folder containing the built standalone engine (i.e. the bundle). This is useful for constructing paths to resources that have been copied into the bundle at build time.<p></p><p>On Android <b>the engine folder</b> property returns the (virtual) path to the engine and its assets.</p><p></p><p>This property is read only and is equivalent to the specialFolderPath(&quot;engine&quot;) function.</p></comments>
68+
<comments>On iOS <b>the engine folder </b>property returns the path to the folder containing the built standalone engine (i.e. the bundle). This is useful for constructing paths to resources that have been copied into the bundle at build time.<p></p><p>On Android <b>the engine folder</b> property returns the (virtual) path to the engine and its assets.<p></p><p>On Desktop platforms <b>the engine folder</b> property returns the folder of the engine.</p><p></p><p>This property is read only and is equivalent to the specialFolderPath("engine") function.</p></comments>
6269
</description>
6370
</doc>

‎docs/notes/bugfix-13026.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#put the engine folder behaves inconsistently

‎docs/notes/feature-threaded_rendering.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Threaded Rendering
2+
3+
In an effort to boost graphic rendering performance, when LiveCode is run on a machine with multiple cores, all stacks with accelerated rendering turned off will be split into multiple tiles, with each tile being rendered individually (and ideally concurrently). The number of tiles the stack is split into depends upon the machine the stack is running on.
4+
5+
So, for example, on a machine with 4 or more cores, a stack will be split up into 4 rectangular tiles - top left, top right, bottom left, bottom right. (On dual core machines, we use a top half bottom half split). Each tile will be rendered individually, meaning that in an ideal situation, we have 4 concurrent drawing operations providing a 4 fold speed increase. This is the ideal, but in reality, in the above case, we see closer to a 2 fold improvement. This will obviously vary with the number of concurrent operations the given machine can perform.

‎engine/Android.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ LOCAL_SRC_FILES := $(addprefix src/,\
7979
exec-interface-object.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
8080
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp exec-keywords.cpp \
8181
syntax.cpp \
82-
foundation-legacy.cpp legacy_spec.cpp )
82+
foundation-legacy.cpp legacy_spec.cpp \
83+
stacktile.cpp sysunxthreads.cpp)
8384

8485
LOCAL_C_INCLUDES := \
8586
$(LOCAL_PATH)/include \

‎engine/Makefile.kernel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ SOURCES=\
7272
exec-interface-object.cpp exec-interface-field-chunk.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
7373
exec-interface-vclip.cpp exec-keywords.cpp exec-legacy.cpp exec-dialog.cpp exec-strings-chunk.cpp \
7474
syntax.cpp \
75-
foundation-legacy.cpp legacy_spec.cpp
75+
foundation-legacy.cpp legacy_spec.cpp \
76+
sysunxthreads.cpp, stacktile.cpp
7677

7778
linuxstubs.cpp: src/linux.stubs ../util/weak_stub_maker.pl
7879
# ../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp

‎engine/engine-mobile.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
/* Begin PBXBuildFile section */
2424
3CC6F42812AD0A6100852B3B /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CC6F42712AD0A6100852B3B /* CFNetwork.framework */; };
25+
4C529CBC1973CF16007C5F7C /* sysunxthreads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C529CBB1973CF16007C5F7C /* sysunxthreads.cpp */; };
26+
4C529CBF1973CF4A007C5F7C /* stacktile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C529CBD1973CF4A007C5F7C /* stacktile.cpp */; };
27+
4C977245193C986700DB2F4A /* coretextfonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C977244193C986700DB2F4A /* coretextfonts.cpp */; };
2528
4CD038F316C8FE1700EBCCBA /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD038F216C8FE1700EBCCBA /* Default-568h@2x.png */; };
2629
4CD7DFE318A140D800CBCB57 /* opensslsocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DEA61040AD9300CAC7EF /* opensslsocket.cpp */; };
2730
4D08A0D0138EA51D0081F990 /* libstandalone-mobile-lib-community.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2D91891386E2610057811A /* libstandalone-mobile-lib-community.a */; };
@@ -562,6 +565,10 @@
562565
4C34550014F3FE8D008D7E50 /* mblandroidad.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mblandroidad.cpp; path = src/mblandroidad.cpp; sourceTree = "<group>"; };
563566
4C34550114F3FEA1008D7E50 /* mbliphonead.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonead.mm; path = src/mbliphonead.mm; sourceTree = "<group>"; };
564567
4C34550314F3FF12008D7E50 /* AdModule.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = AdModule.java; sourceTree = "<group>"; };
568+
4C529CBA1973CF16007C5F7C /* systhreads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = systhreads.h; path = src/systhreads.h; sourceTree = "<group>"; };
569+
4C529CBB1973CF16007C5F7C /* sysunxthreads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysunxthreads.cpp; path = src/sysunxthreads.cpp; sourceTree = "<group>"; };
570+
4C529CBD1973CF4A007C5F7C /* stacktile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stacktile.cpp; path = src/stacktile.cpp; sourceTree = "<group>"; };
571+
4C529CBE1973CF4A007C5F7C /* stacktile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stacktile.h; path = src/stacktile.h; sourceTree = "<group>"; };
565572
4C6D0A371407D04D003B1BA3 /* sysunxnetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysunxnetwork.cpp; path = src/sysunxnetwork.cpp; sourceTree = "<group>"; };
566573
4C7D1CE31476747700129F01 /* exec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = exec.h; path = src/exec.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
567574
4C7D1CE5147674C300129F01 /* mblcamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblcamera.cpp; path = src/mblcamera.cpp; sourceTree = "<group>"; };
@@ -1746,9 +1753,10 @@
17461753
4DD3DE501040AD0F00CAC7EF /* image.h */,
17471754
E84A254C1680BFF600EA7ACC /* image_rep.cpp */,
17481755
E865A51D1695BF3E00C4CBC3 /* image_rep.h */,
1756+
E8AB9052180E9DCD0050A249 /* image_rep_densitymapped.cpp */,
17491757
4D8C6999167A22B500D3CCE7 /* image_rep_encoded.cpp */,
17501758
4D8C699A167A22B500D3CCE7 /* image_rep_mutable.cpp */,
1751-
E8AB9052180E9DCD0050A249 /* image_rep_densitymapped.cpp */,
1759+
E8BE6E29182966BA00D7C604 /* image_rep_resampled.cpp */,
17521760
4D8C699B167A22B500D3CCE7 /* imagebitmap.cpp */,
17531761
E865A51E1695BF3E00C4CBC3 /* imagebitmap.h */,
17541762
4DD3DE661040AD2800CAC7EF /* ipng.cpp */,
@@ -1795,7 +1803,8 @@
17951803
4DD3DEE61040ADEF00CAC7EF /* stacke.cpp */,
17961804
4DD3DEE51040ADEF00CAC7EF /* stacklst.cpp */,
17971805
4DD3DEE41040ADEF00CAC7EF /* stacklst.h */,
1798-
76EF32E51822756F00FAC195 /* stackview.cpp */,
1806+
4C529CBD1973CF4A007C5F7C /* stacktile.cpp */,
1807+
4C529CBE1973CF4A007C5F7C /* stacktile.h */,
17991808
4DD3DF061040ADFC00CAC7EF /* styledtext.cpp */,
18001809
4DD3DF051040ADFC00CAC7EF /* styledtext.h */,
18011810
4DD3DF111040ADFC00CAC7EF /* tooltip.cpp */,
@@ -1868,14 +1877,16 @@
18681877
E84BE35B170C967B00807CF6 /* System */ = {
18691878
isa = PBXGroup;
18701879
children = (
1871-
4D232D5F18DAF06800A4FF3E /* quicktime.cpp */,
18721880
4DD3DEA31040AD9300CAC7EF /* osspec.h */,
1881+
4D232D5F18DAF06800A4FF3E /* quicktime.cpp */,
18731882
4DFFC8F613DD90CE006233A4 /* syscfdate.cpp */,
18741883
4D01C36F13CE3C810041A281 /* sysdefs.h */,
18751884
4DE7ED6413B33CEA002634F5 /* sysspec.cpp */,
18761885
4DD3DF041040ADFC00CAC7EF /* System.h */,
1886+
4C529CBA1973CF16007C5F7C /* systhreads.h */,
18771887
4C6D0A371407D04D003B1BA3 /* sysunxnetwork.cpp */,
18781888
76EF323E182145CA00FAC195 /* sysunxrandom.cpp */,
1889+
4C529CBB1973CF16007C5F7C /* sysunxthreads.cpp */,
18791890
);
18801891
name = System;
18811892
sourceTree = "<group>";
@@ -2290,6 +2301,7 @@
22902301
4DABCDA015ECD4700085E214 /* buttondraw.cpp in Sources */,
22912302
4DABCDA115ECD4700085E214 /* capsule.cpp in Sources */,
22922303
4DABCDA215ECD4700085E214 /* card.cpp in Sources */,
2304+
4C529CBC1973CF16007C5F7C /* sysunxthreads.cpp in Sources */,
22932305
4DABCDA315ECD4700085E214 /* cardlst.cpp in Sources */,
22942306
4DABCDA415ECD4700085E214 /* cdata.cpp in Sources */,
22952307
4DABCDA515ECD4700085E214 /* chunk.cpp in Sources */,
@@ -2539,6 +2551,15 @@
25392551
7268ED951848C30200D10598 /* exec-textmessaging.cpp in Sources */,
25402552
BE449501175CDE7400346B49 /* exec.cpp in Sources */,
25412553
4DBF5B291802E63F009CAB2E /* socket_resolve.cpp in Sources */,
2554+
E8C22C46177B1700003785D3 /* cgimageutil.cpp in Sources */,
2555+
4C977245193C986700DB2F4A /* coretextfonts.cpp in Sources */,
2556+
4C529CBF1973CF4A007C5F7C /* stacktile.cpp in Sources */,
2557+
E8C22E57177B2884003785D3 /* imagelist.cpp in Sources */,
2558+
E8C22E73177B2960003785D3 /* graphicscontext.cpp in Sources */,
2559+
E8C22E75177B2B53003785D3 /* mbltheme.cpp in Sources */,
2560+
E8B6EE1417F0A1C900F77E0E /* stackview.cpp in Sources */,
2561+
E8AB9053180E9DCD0050A249 /* image_rep_densitymapped.cpp in Sources */,
2562+
E8BE6E2A182966BA00D7C604 /* image_rep_resampled.cpp in Sources */,
25422563
E877A6181850D85F008FDE2C /* resolution.cpp in Sources */,
25432564
7231B08718CF3FFF00295AE6 /* graphicscontext.cpp in Sources */,
25442565
7231B08A18CF40B600295AE6 /* imagelist.cpp in Sources */,

0 commit comments

Comments
 (0)