Skip to content

Commit b31e3a3

Browse files
author
runrevali
committed
Merge branch 'release-6.5.3' of https://github.com/runrev/livecode into refactor-syntax_unicode
Conflicts: Makefile engine/Makefile.common engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/src/bitmapeffect.cpp engine/src/block.cpp engine/src/button.cpp engine/src/executionerrors.h engine/src/font.cpp engine/src/font.h engine/src/globals.cpp engine/src/ifile.cpp engine/src/lnxdc.h engine/src/lnxdcs.cpp engine/src/menuparse.cpp engine/src/mode_standalone.cpp engine/src/object.cpp engine/src/osxdc.h engine/src/osxmisc.cpp engine/src/property.cpp engine/src/rtf.cpp engine/src/sysunxdate.cpp engine/src/w32dc.h engine/src/w32dcs.cpp ide libgraphics/src/mblandroidtext.cpp thirdparty version
2 parents 19b812d + 3e5fadd commit b31e3a3

File tree

318 files changed

+4687
-7654
lines changed

Some content is hidden

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

318 files changed

+4687
-7654
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ kernel-standalone: kernel
5757
kernel-development: kernel
5858
$(MAKE) -C ./engine -f Makefile.kernel-development libkernel-development
5959

60-
kernel-server:
60+
kernel-server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation libgraphics
6161
$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
6262

6363
development: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-development revsecurity
@@ -70,7 +70,7 @@ installer: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundati
7070

7171
$(MAKE) -C ./engine -f Makefile.installer installer
7272

73-
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel kernel-server revsecurity
73+
server: libz libgif libjpeg libpcre libpng libopenssl libexternal libfoundation kernel-server revsecurity libgraphics
7474
$(MAKE) -C ./engine -f Makefile.server server-community
7575

7676
###############################################################################

docs/dictionary/command/accept.xml

100644100755
Lines changed: 67 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,69 @@
11
<doc>
2-
<legacy_id>1099</legacy_id>
3-
<name>accept</name>
4-
<type>command</type>
5-
<syntax>
6-
<example>accept [datagram] connections on port <i>number</i> with message <i>callbackMessage</i></example>
7-
</syntax>
8-
<library></library>
9-
<objects>
10-
</objects>
11-
<synonyms>
12-
</synonyms>
13-
<classification>
14-
<category>Networks &amp; Communication</category>
15-
</classification>
16-
<references>
17-
<command tag="close socket">close socket Command</command>
18-
<function tag="hostNameToAddress">hostNameToAddress Function</function>
19-
<command tag="open socket">open socket Command</command>
20-
<function tag="openSockets">openSockets Function</function>
21-
<command tag="read from socket">read from socket Command</command>
22-
<command tag="write to socket">write to socket Command</command>
23-
<function tag="peerAddress">peerAddress Function</function>
24-
<function tag="hostAddress">hostAddress Function</function>
25-
<function tag="hostAddressToName">hostAddressToName Function</function>
26-
<function tag="hostName">hostName Function</function>
27-
<property tag="HTTPProxy">HTTPProxy Property</property>
28-
</references>
29-
<history>
30-
<introduced version="1.0">Added.</introduced>
31-
</history>
32-
<platforms>
33-
<mac/>
34-
<windows/>
35-
<linux/>
36-
</platforms>
37-
<classes>
38-
<desktop/>
39-
<server/>
40-
<web/>
41-
</classes>
42-
<security>
43-
<network/>
44-
</security>
45-
<summary>Accepts an internet connection and creates a <glossary tag="socket">socket</glossary> for that connection.</summary>
46-
<examples>
47-
<example>accept connections on port 80 with message "webConnect"</example>
48-
<example>accept datagram connections on port it with message myMessage</example>
49-
</examples>
50-
<description>
51-
<p>Use the <b>accept</b> <glossary tag="command">command</glossary> when running a <glossary tag="server">server</glossary>, to accept <glossary tag="TCP">TCP</glossary> connections or <glossary tag="UDP">UDP</glossary> <glossary tag="datagram">datagrams</glossary> from other systems (or other <glossary tag="process">processes</glossary> on the same system).</p><p>Use the datagram option if you want to accept UDP datagrams.</p><p/><p><b>Parameters:</b></p><p>The <i>portNumber</i> is the <glossary tag="TCP">TCP</glossary> <glossary tag="port">port</glossary> number on which to accept connections.</p><p>The <i>callbackMessage</i> is the name of a <keyword tag="message box">message</keyword> to be sent when a connection is made or a <glossary tag="datagram">datagram</glossary> is received.</p><p></p><p><b>Comments:</b></p><p>When a connection is made or a datagram is received, the <b>accept</b> <glossary tag="command">command</glossary> creates a new <glossary tag="socket">socket</glossary> that can be used to communicate with the other system (or <glossary tag="process">process</glossary>). When using the <command tag="close socket">close socket</command>, <command tag="read from socket">read from socket</command>, or <command tag="write to socket">write to socket</command> <glossary tag="command">commands</glossary>, you can refer to this <glossary tag="socket">socket</glossary> with a socket identifier that looks like this:</p><p><i>host</i>:<i>port</i>[|<i>connectionID</i>]</p><p>where the <i>connectionID</i> is a number assigned by the <b>accept</b> <glossary tag="command">command</glossary>. (You only need to specify the connection number if there is more than one <glossary tag="socket">socket</glossary> connected to a particular <glossary tag="port">port</glossary> and <glossary tag="disabled">host</glossary>.)</p><p/><p>The <i>callbackMessage</i> is sent to the <glossary tag="object">object</glossary> whose <property tag="script">script</property> contains the <b>accept</b> <glossary tag="command">command</glossary>. Either one or two <glossary tag="parameter">parameters</glossary> are sent with this <keyword tag="message box">message</keyword>. The first <glossary tag="parameter">parameter</glossary> is the <glossary tag="IP address">IP address</glossary> of the system or <glossary tag="process">process</glossary> making the connection. If a <glossary tag="datagram">datagram</glossary> is being accepted, the second <glossary tag="parameter">parameter</glossary> is the contents of the <glossary tag="datagram">datagram</glossary>.</p><p/><p>For technical information about sockets, see RFC 147 at &lt;<u>http://www.ietf.org/rfc/rfc147.txt</u>&gt;.</p><p>For technical information about UDP datagrams, see RFC 768 at &lt;<u>http://www.ietf.org/rfc/rfc0768.txt</u>&gt;.</p><p>For technical information about the numbers used to designate standard ports, see the list of port numbers at &lt;<u>http://www.iana.org/assignments/port-numbers</u>&gt;<i>,</i> in particular the section entitled "Well Known Port Numbers".</p>
52-
</description>
2+
<legacy_id>1099</legacy_id>
3+
<name>accept</name>
4+
<type>command</type>
5+
6+
<syntax>
7+
<example>accept [datagram] connections on port <i>number</i> with message <i>callbackMessage</i></example>
8+
</syntax>
9+
10+
<synonyms>
11+
</synonyms>
12+
13+
<summary>Accepts an internet connection and creates a <glossary tag="socket">socket</glossary> for that connection.</summary>
14+
15+
<examples>
16+
<example>accept connections on port 80 with message "connectionMade"</example>
17+
<example><font face="courier new" size="17">accept datagram connections on port 80 with message "</font>connectionMade<font face="courier new" size="17">"</font></example>
18+
<example><p>on mouseUp</p><p> accept connections on port 80 with message "connectionMade"</p><p>end mouseUp</p><p></p><p>on connectionMade pIPAddress</p><p> put "Connection made:" &amp;&amp; pIPAddress</p><p>end connectionMade</p></example>
19+
</examples>
20+
21+
<history>
22+
<introduced version="1.0">Added.</introduced>
23+
<deprecated version=""></deprecated>
24+
<removed version=""></removed>
25+
26+
<experimental version=""></experimental>
27+
<nonexperimental version=""></nonexperimental>
28+
</history>
29+
30+
<objects>
31+
</objects>
32+
33+
<platforms>
34+
<mac/>
35+
<windows/>
36+
<linux/>
37+
</platforms>
38+
39+
<classes>
40+
<desktop/>
41+
<server/>
42+
<web/>
43+
</classes>
44+
45+
<security>
46+
<network/>
47+
</security>
48+
49+
50+
<classification>
51+
<category>Networks &amp; Communication</category>
52+
</classification>
53+
54+
<references>
55+
<function tag="hostNameToAddress">hostNameToAddress Function</function>
56+
<function tag="openSockets">openSockets Function</function>
57+
<function tag="peerAddress">peerAddress Function</function>
58+
<function tag="hostAddress">hostAddress Function</function>
59+
<function tag="hostAddressToName">hostAddressToName Function</function>
60+
<function tag="hostName">hostName Function</function>
61+
<command tag="close socket">close socket Command</command>
62+
<command tag="open socket">open socket Command</command>
63+
<command tag="read from socket">read from socket Command</command>
64+
<command tag="write to socket">write to socket Command</command>
65+
<property tag="HTTPProxy">HTTPProxy Property</property>
66+
</references>
67+
68+
<description>Use the <b>accept</b> <glossary tag="command">command</glossary> when running a <glossary tag="server">server</glossary>, to accept <glossary tag="TCP">TCP</glossary> connections or <glossary tag="UDP">UDP</glossary> <glossary tag="datagram">datagrams</glossary> from other systems (or other <glossary tag="process">processes</glossary> on the same system).<p>Use the datagram option if you want to accept UDP datagrams.</p><p></p><p><b>Parameters:</b></p><p>The <i>portNumber</i> is the <glossary tag="TCP">TCP</glossary> <glossary tag="port">port</glossary> number on which to accept connections.</p><p>The <i>callbackMessage</i> is the name of a <keyword tag="message box">message</keyword> to be sent when a connection is made or a <glossary tag="datagram">datagram</glossary> is received.</p><p></p><p><b>Comments:</b></p><p>When a connection is made or a datagram is received, the <b>accept</b> <glossary tag="command">command</glossary> creates a new <glossary tag="socket">socket</glossary> that can be used to communicate with the other system (or <glossary tag="process">process</glossary>). When using the <command tag="close socket">close socket</command>, <command tag="read from socket">read from socket</command>, or <command tag="write to socket">write to socket</command> <glossary tag="command">commands</glossary>, you can refer to this <glossary tag="socket">socket</glossary> with a socket identifier that looks like this:</p><p><i>host</i>:<i>port</i>[|<i>connectionID</i>]</p><p>where the <i>connectionID</i> is a number assigned by the <b>accept</b> <glossary tag="command">command</glossary>. (You only need to specify the connection number if there is more than one <glossary tag="socket">socket</glossary> connected to a particular <glossary tag="port">port</glossary> and <glossary tag="disabled">host</glossary>.)</p><p></p><p>The <i>callbackMessage</i> is sent to the <glossary tag="object">object</glossary> whose <property tag="script">script</property> contains the <b>accept</b> <glossary tag="command">command</glossary>. Either one or two <glossary tag="parameter">parameters</glossary> are sent with this <keyword tag="message box">message</keyword>. The first <glossary tag="parameter">parameter</glossary> is the <glossary tag="IP address">IP address</glossary> of the system or <glossary tag="process">process</glossary> making the connection. If a <glossary tag="datagram">datagram</glossary> is being accepted, the second <glossary tag="parameter">parameter</glossary> is the contents of the <glossary tag="datagram">datagram</glossary>.</p><p></p><p>For technical information about sockets, see RFC 147 at &lt;<u>http://www.ietf.org/rfc/rfc147.txt</u>&gt;.</p><p>For technical information about UDP datagrams, see RFC 768 at &lt;<u>http://www.ietf.org/rfc/rfc0768.txt</u>&gt;.</p><p>For technical information about the numbers used to designate standard ports, see the list of port numbers at &lt;<u>http://www.iana.org/assignments/port-numbers</u>&gt;<i>,</i> in particular the section entitled "Well Known Port Numbers".</p></description>
5369
</doc>

docs/dictionary/command/add.xml

100644100755
Lines changed: 61 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,63 @@
11
<doc>
2-
<legacy_id>1968</legacy_id>
3-
<name>add</name>
4-
<type>command</type>
5-
<syntax>
6-
<example>add <i>number</i> to [<i>chunk</i> of] <i>container</i></example>
7-
<example>add {<i>number </i>| <i>array</i>} to <i>arrayContainer</i></example>
8-
</syntax>
9-
<library></library>
10-
<objects>
11-
</objects>
12-
<synonyms>
13-
</synonyms>
14-
<classification>
15-
<category>Math, Logic, &amp; Dates</category>
16-
</classification>
17-
<references>
18-
<command tag="multiply">multiply Command</command>
19-
<command tag="union">union Command</command>
20-
<function tag="sum">sum Function</function>
21-
</references>
22-
<history>
23-
<introduced version="1.0">Added.</introduced>
24-
<changed version="1.1"></changed>
25-
</history>
26-
<platforms>
27-
<mac/>
28-
<windows/>
29-
<linux/>
30-
<ios/>
31-
<android/>
32-
</platforms>
33-
<classes>
34-
<desktop/>
35-
<server/>
36-
<web/>
37-
</classes>
38-
<security>
39-
</security>
40-
<summary>Adds a number to a <glossary tag="container">container</glossary> and places the resulting <function tag="value">value</function> in the <glossary tag="container">container</glossary>.</summary>
41-
<examples>
42-
<example>add 7 to field "Previous Amount"</example>
43-
<example>add field "New" to summaryOfInventory</example>
44-
<example>add qty * price to last line of myOrder</example>
45-
</examples>
46-
<description>
47-
<p>Use the <b>add</b> <glossary tag="command">command</glossary> to add a number to a <glossary tag="container">container</glossary> or a portion of a <glossary tag="container">container</glossary>, or to add two <glossary tag="array">arrays</glossary> containing numbers.</p><p/><p><b>Parameters:</b></p><p>The <i>number</i> is an <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a number.</p><p>The <i>chunk</i> is a <glossary tag="chunk expression">chunk expression</glossary> specifying a portion of the <i>container</i>.</p><p>The <i>container</i> is a <keyword tag="field">field</keyword>, <keyword tag="button">button</keyword>, or <glossary tag="variable">variable</glossary>, or the <keyword tag="message box">message box</keyword>.</p><p>The <i>arrayContainer</i> is an <glossary tag="array">array</glossary> <glossary tag="variable">variable</glossary> each of whose <glossary tag="element">elements</glossary> is a number.</p><p/><p><b>Comments:</b></p><p>The contents of the <i>container</i> (or the <i>chunk</i> of the <i>container</i>) must be a number or an <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a number.</p><p/><p>If a <i>number</i> is added to an <i>arrayContainer</i>, the <i>number</i> is added to each <keyword tag="element">element</keyword>. If an <i>array</i> is added to an <i>arrayContainer</i>, both <glossary tag="array">arrays</glossary> must have the same number of <glossary tag="element">elements</glossary> and the same dimension, and each <keyword tag="element">element</keyword> in the <i>array</i> is added to the corresponding <keyword tag="element">element</keyword> of the <i>arrayContainer</i>.</p><p/><p>If the <i>container</i> or an <keyword tag="element">element</keyword> of the <i>arrayContainer</i> is empty, the <b>add</b> <glossary tag="command">command</glossary> treats its contents as zero.</p><p>If <i>container</i> is a <keyword tag="field">field</keyword> or <keyword tag="button">button</keyword>, the <function tag="format">format</function> of the sum is determined by the <property tag="numberFormat">numberFormat</property> <glossary tag="property">property</glossary>.</p><p/><p><b>Changes:</b></p><p>The add to <i>arrayContainer</i> form was introduced in version 1.1. In previous versions, only single numbers could be used with the <b>add</b> <glossary tag="command">command</glossary>.</p>
48-
</description>
2+
<legacy_id>1968</legacy_id>
3+
<name>add</name>
4+
<type>command</type>
5+
6+
<syntax>
7+
<example>add <i>number</i> to [<i>chunk</i> of] <i>container</i></example>
8+
<example>add {<i>number </i>| <i>array</i>} to <i>arrayContainer</i></example>
9+
</syntax>
10+
11+
<synonyms>
12+
</synonyms>
13+
14+
<summary>Adds a number to a <glossary tag="container">container</glossary> and places the resulting <function tag="value">value</function> in the <glossary tag="container">container</glossary>.</summary>
15+
16+
<examples>
17+
<example>add 7 to field 1</example>
18+
<example>add field "New" to tSummaryOfInventory</example>
19+
<example><p>add (qty * price) to last line of tOrder</p></example>
20+
</examples>
21+
22+
<history>
23+
<introduced version="1.0">Added.</introduced>
24+
<deprecated version=""></deprecated>
25+
<removed version=""></removed>
26+
<changed version="1.1">1.1</changed>
27+
<experimental version=""></experimental>
28+
<nonexperimental version=""></nonexperimental>
29+
</history>
30+
31+
<objects>
32+
</objects>
33+
34+
<platforms>
35+
<mac/>
36+
<windows/>
37+
<linux/>
38+
<ios/>
39+
<android/>
40+
</platforms>
41+
42+
<classes>
43+
<desktop/>
44+
<server/>
45+
<web/>
46+
</classes>
47+
48+
<security>
49+
</security>
50+
51+
52+
<classification>
53+
<category>Math, Logic, &amp; Dates</category>
54+
</classification>
55+
56+
<references>
57+
<function tag="sum">sum Function</function>
58+
<command tag="multiply">multiply Command</command>
59+
<command tag="union">union Command</command>
60+
</references>
61+
62+
<description>Use the <b>add</b> <glossary tag="command">command</glossary> to add a number to a <glossary tag="container">container</glossary> or a portion of a <glossary tag="container">container</glossary>, or to add two <glossary tag="array">arrays</glossary> containing numbers.<p></p><p><b>Parameters:</b></p><p>The <i>number</i> is an <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a number.</p><p>The <i>chunk</i> is a <glossary tag="chunk expression">chunk expression</glossary> specifying a portion of the <i>container</i>.</p><p>The <i>container</i> is a <keyword tag="field">field</keyword>, <keyword tag="button">button</keyword>, or <glossary tag="variable">variable</glossary>, or the <keyword tag="message box">message box</keyword>.</p><p>The <i>arrayContainer</i> is an <glossary tag="array">array</glossary> <glossary tag="variable">variable</glossary> each of whose <glossary tag="element">elements</glossary> is a number.</p><p></p><p><b>Comments:</b></p><p>The contents of the <i>container</i> (or the <i>chunk</i> of the <i>container</i>) must be a number or an <glossary tag="expression">expression</glossary> that <glossary tag="evaluate">evaluates</glossary> to a number.</p><p></p><p>If a <i>number</i> is added to an <i>arrayContainer</i>, the <i>number</i> is added to each <keyword tag="element">element</keyword>. If an <i>array</i> is added to an <i>arrayContainer</i>, both <glossary tag="array">arrays</glossary> must have the same number of <glossary tag="element">elements</glossary> and the same dimension, and each <keyword tag="element">element</keyword> in the <i>array</i> is added to the corresponding <keyword tag="element">element</keyword> of the <i>arrayContainer</i>.</p><p></p><p>If the <i>container</i> or an <keyword tag="element">element</keyword> of the <i>arrayContainer</i> is empty, the <b>add</b> <glossary tag="command">command</glossary> treats its contents as zero.</p><p>If <i>container</i> is a <keyword tag="field">field</keyword> or <keyword tag="button">button</keyword>, the <function tag="format">format</function> of the sum is determined by the <property tag="numberFormat">numberFormat</property> <glossary tag="property">property</glossary>.</p><p></p><p></p><change><p>The add to <i>arrayContainer</i> form was introduced in version 1.1. In previous versions, only single numbers could be used with the <b>add</b> <glossary tag="command">command</glossary>.</change></description>
4963
</doc>

0 commit comments

Comments
 (0)