Skip to content

Commit db61bba

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop' into refactor
Conflicts: engine/src/execpt.cpp ide libgraphics/src/utils.cpp thirdparty version
2 parents f03f079 + 0049294 commit db61bba

24 files changed

Lines changed: 568 additions & 353 deletions

‎docs/notes/bugfix-13278.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Fix a button focus issue
2+

‎docs/notes/bugfix-13362.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Script editor opens revmenubar script when no other stack is open

‎docs/notes/bugfix-13374.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
LiveCode hangs when setting the text of a field with HGRID and a hidden last line

‎docs/notes/bugfix-13445.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Crash due to multicore rendering.

‎docs/notes/bugfix-13447.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Project Browser control layer display

‎docs/notes/bugfix-13455.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Non-executable file redirection on Mac
2+
Mac AppStore rules require that only executables (including bundles and apps) are present within the Contents/MacOS folder in the application bundle.
3+
However, historically (for cross-platform purposes), LiveCode applications traditional place resources relative to the engine executable, resulting in non-executable files to be present in the Contents/MacOS folder which violates AppStore signing policy.
4+
To remedy this situation without requiring users to change scripts, a simple redirection facility has been implemented in the engine:
5+
If an attempt is made to open a file for read which falls within Contents/MacOS and does not exist, the engine will attempt to open the same path but under Contents/Resources/_MacOS instead.
6+
If an attempt is made to list files in a folder which falls within Contents/MacOS, the engine will list files in that folder and concatenate them will files within the same folder under Contents/Resources/_MacOS.
7+
Additionally the standalone builder has had an extra processing step added on Mac:
8+
After the Mac bundle has been built, the S/B recurses through Contents/MacOS and creates an identical folder structure based at Contents/Resources/_MacOS. All non-executable files in any folders under Contents/MacOS are moved to the same folder under Contents/Resources/_MacOS whereas any Mach-O executable files are left where they are.
9+
The result of this is that after building a standalone, from a script's point of view nothing has changed; but the app bundle will conform to the rules required for signing for the Mac AppStore.

‎docs/notes/bugfix-13458.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Memory leak when setting the text of an image

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,10 @@
288288
4D657F9D17143B800086071B /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D6C797917134897000BCF78 /* libz.a */; };
289289
4D67BB24164A76090092CF4C /* exec-ide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D67BB23164A76090092CF4C /* exec-ide.cpp */; };
290290
4D67BBB9164AB2C50092CF4C /* exec-printing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D67BBB8164AB2C50092CF4C /* exec-printing.cpp */; };
291-
4D6A00F010C578C600FA48D2 /* customprinter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D6A00EE10C578C600FA48D2 /* customprinter.cpp */; };
292291
4D6C27FD1647D942007C96B7 /* exec-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D6C27FB1647D942007C96B7 /* exec-graphics.cpp */; };
293292
4D6C27FE1647D942007C96B7 /* exec-security.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D6C27FC1647D942007C96B7 /* exec-security.cpp */; };
294293
4D6C28B61647DC4F007C96B7 /* libfoundation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7FA7BB1594E0FA00EEF440 /* libfoundation.a */; };
295-
4D6F2AE718981E7F0099947D /* mac-pasteboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D6F2AE618981E7F0099947D /* mac-pasteboard.mm */; };
294+
4D6F2AE718981E7F0099947D /* (null) in Sources */ = {isa = PBXBuildFile; };
296295
4D7740CB1226AA58001C9150 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5881C10B80C7C300200116 /* Quartz.framework */; };
297296
4D7740CC1226AA65001C9150 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5881C10B80C7C300200116 /* Quartz.framework */; };
298297
4D77F1DD183F8298002EEBB4 /* exec-keywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D77F1DC183F8298002EEBB4 /* exec-keywords.cpp */; };
@@ -1070,7 +1069,6 @@
10701069
4C8B5BBD19733D230014058F /* stacktile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = stacktile.h; path = src/stacktile.h; sourceTree = "<group>"; };
10711070
4CC1535614E7FB91009FA80E /* paragrafattr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = paragrafattr.cpp; path = src/paragrafattr.cpp; sourceTree = "<group>"; };
10721071
4CC1536114E7FE1D009FA80E /* fieldstyledtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fieldstyledtext.cpp; path = src/fieldstyledtext.cpp; sourceTree = "<group>"; };
1073-
4CC55320180D546000C10387 /* graphics_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = graphics_util.h; path = src/graphics_util.h; sourceTree = "<group>"; };
10741072
4CF4B87F199E0C1C00E33AEE /* coretextlayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = coretextlayout.mm; path = src/coretextlayout.mm; sourceTree = "<group>"; };
10751073
4D00C6280CE1F27300341AD3 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
10761074
4D00CD75103305D4003D3C0D /* bitmapeffectblur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmapeffectblur.cpp; path = src/bitmapeffectblur.cpp; sourceTree = "<group>"; };
@@ -2302,8 +2300,6 @@
23022300
76EF31A5181E7D8000FAC195 /* cgimageutil.cpp */,
23032301
76EF31A3181E7CCE00FAC195 /* osxcisupport.mm */,
23042302
76CCAA7B198003B000C79271 /* mac-qt-recorder.mm */,
2305-
E8AE876B177B3F5C0041B7E0 /* cgimageutil.cpp */,
2306-
4C977250193CAF5000DB2F4A /* coretextfonts.cpp */,
23072303
4CF4B87F199E0C1C00E33AEE /* coretextlayout.mm */,
23082304
4D5880140B80A4F800200116 /* osxcoreimage.cpp */,
23092305
4D4F9E6613CDFB8100B9B15D /* osxfield.cpp */,
@@ -4410,40 +4406,8 @@
44104406
7635171D182A8D3D00C31FA2 /* image_rep_densitymapped.cpp in Sources */,
44114407
4D77F1DD183F8298002EEBB4 /* exec-keywords.cpp in Sources */,
44124408
763FF4EA18522CC100B45FBA /* image_rep_resampled.cpp in Sources */,
4413-
4DB32404174BEE3300046FFE /* sysosxrandom.cpp in Sources */,
4414-
4C10D85416BFB1DC00D25197 /* graphicscontext.cpp in Sources */,
4415-
E8B5BB1416DF77DF00CA02FB /* imagelist.cpp in Sources */,
4416-
E8687A941987F5A80093C756 /* imageloader.cpp in Sources */,
4417-
E8AF465B174CF247000B2F9E /* surface.cpp in Sources */,
4418-
E8AE876C177B3F5C0041B7E0 /* cgimageutil.cpp in Sources */,
4419-
E8988A8A17FDD5B700F640F4 /* stackview.cpp in Sources */,
4420-
4D1AA1E5181556180075FC5E /* bitmapeffect.cpp in Sources */,
4421-
E85130F4180D9969004D1DB4 /* image_rep_densitymapped.cpp in Sources */,
4422-
4DECC93C18856C7500463D52 /* mac-core.mm in Sources */,
4423-
4DECC93F18856CB100463D52 /* desktop.cpp in Sources */,
4424-
4DECC9E71885803D00463D52 /* desktop-dc.cpp in Sources */,
4425-
4DECC9E91885808100463D52 /* desktop-stack.cpp in Sources */,
4426-
4DECCA511885958300463D52 /* osxstack.cpp in Sources */,
4427-
4DECCA5B188595F500463D52 /* desktop-menu.cpp in Sources */,
4428-
4DECD0C81886E4FD00463D52 /* mac-window.mm in Sources */,
4429-
4DECD1351886F0FF00463D52 /* mac-surface.mm in Sources */,
4430-
4DECD1FD1887F24E00463D52 /* platform-window.cpp in Sources */,
4431-
4DECD26E188807E400463D52 /* platform-surface.cpp in Sources */,
4432-
4DC6E30518896CFB00FD43C3 /* mac-menu.mm in Sources */,
4433-
4D444FB5188DCB4400C7B349 /* mac-cursor.mm in Sources */,
4434-
4D6F2AE718981E7F0099947D /* mac-pasteboard.mm in Sources */,
4435-
4D30C37118995E840034CDC6 /* desktop-pasteboard.cpp in Sources */,
4436-
4D30CAF6189AC1720034CDC6 /* mac-snapshot.mm in Sources */,
4437-
4C529CAE1973CBF6007C5F7C /* player-platform.cpp in Sources */,
4438-
4D30CB27189AC40C0034CDC6 /* mac-font.mm in Sources */,
4439-
4D30D1F018A152700034CDC6 /* mac-player.mm in Sources */,
4440-
4D30D5D218A394250034CDC6 /* desktop-image.cpp in Sources */,
4441-
4D79B4E118A8D9FD00D4974C /* mac-color.mm in Sources */,
4442-
4D79B5D418A9087B00D4974C /* mac-printer.mm in Sources */,
4443-
4D30E18218AA2FCE0034CDC6 /* mac-abort.mm in Sources */,
4444-
4D30E40718AA73870034CDC6 /* mac-dialog.mm in Sources */,
4409+
4D6F2AE718981E7F0099947D /* (null) in Sources */,
44454410
4CF4B883199E0D9900E33AEE /* coretextlayout.mm in Sources */,
4446-
4D30E44618AA7C200034CDC6 /* desktop-ans.cpp in Sources */,
44474411
E82206E1184F810A00117D10 /* resolution.cpp in Sources */,
44484412
72C28AFA1911300D007F2AA0 /* segment.cpp in Sources */,
44494413
BEBC51DA195350C300215C85 /* coretextfonts.cpp in Sources */,

‎engine/src/button.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,6 +1538,12 @@ Boolean MCButton::mup(uint2 which, bool p_release)
15381538
// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
15391539
layer_redrawall();
15401540
}
1541+
1542+
// FG-2014-09-16: [[ Bugfix 13278 ]] Clear the mouse focus if this is not
1543+
// an auto-arming button (e.g. a button within a menu).
1544+
if (!(flags & F_AUTO_ARM))
1545+
state &= ~CS_MFOCUSED;
1546+
15411547
return True;
15421548
}
15431549

‎engine/src/desktop.cpp‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,10 @@ void MCPlatformHandleApplicationResume(void)
109109
MCdefaultstackptr -> getcard() -> message(MCM_resume);
110110
}
111111

112-
void MCPlatformHandleApplicationRun(void)
112+
void MCPlatformHandleApplicationRun(bool& r_continue)
113113
{
114-
X_main_loop();
114+
X_main_loop_iteration();
115+
r_continue = !MCquit;
115116
}
116117

117118
////////////////////////////////////////////////////////////////////////////////
@@ -1283,32 +1284,3 @@ void MCPlatformHandleSoundFinished(MCPlatformSoundRef p_sound)
12831284
}
12841285

12851286
////////////////////////////////////////////////////////////////////////////////
1286-
1287-
#if 0
1288-
void MCPlatformProcess(MCPlatformCallback& p_callback)
1289-
{
1290-
switch(p_callback . type)
1291-
{
1292-
case kMCPlatformCallbackApplicationStartup:
1293-
MCPlatformHandleApplicationStartup(p_callb
1294-
ack . application . startup . argc,
1295-
p_callback . application . startup . argv,
1296-
p_callback . application . startup . envp,
1297-
p_callback . application . startup . error_code,
1298-
p_callback . application . startup . error_message);
1299-
break;
1300-
case kMCPlatformCallbackApplicationShutdown:
1301-
MCPlatformHandleApplicationShutdown(p_callback . application . shutdown . exit_code);
1302-
break;
1303-
case kMCPlatformCallbackApplicationShutdownRequest:
1304-
MCPlatformHandleApplicationShutdownRequest(p_callback . application . shutdown_request . terminate);
1305-
break;
1306-
case kMCPlatformCallbackApplicationRun:
1307-
MCPlatformHandleApplicationRun();
1308-
default:
1309-
break;
1310-
}
1311-
}
1312-
#endif
1313-
1314-
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)