Skip to content

Commit d224b12

Browse files
'the files' now displays unicode files on Linux
Initialisation error fixed for the printer in X_open Files to compile and include paths updated
1 parent 3f0c101 commit d224b12

File tree

4 files changed

+20
-31
lines changed

4 files changed

+20
-31
lines changed

Livecode.files

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ engine/src/bitmapeffect.h
7272
engine/src/bitmapeffectblur.cpp
7373
engine/src/bitmapeffectblur.h
7474
engine/src/block.cpp
75-
engine/src/block.h
7675
engine/src/bsdiff.h
7776
engine/src/bsdiff_apply.cpp
7877
engine/src/bsdiff_build.cpp
@@ -174,6 +173,7 @@ engine/src/exec-interface-vclip.cpp
174173
engine/src/exec-interface.cpp
175174
engine/src/exec-interface.h
176175
engine/src/exec-interface2.cpp
176+
engine/src/exec-keywords.h
177177
engine/src/exec-legacy.cpp
178178
engine/src/exec-logic.cpp
179179
engine/src/exec-mail.cpp
@@ -439,6 +439,7 @@ engine/src/mblstore.cpp
439439
engine/src/mblstore.h
440440
engine/src/mblsyntax.h
441441
engine/src/mbltextmessaging.cpp
442+
engine/src/MCBlock.h
442443
engine/src/mcerror.cpp
443444
engine/src/mcerror.h
444445
engine/src/mcio.cpp
@@ -774,27 +775,6 @@ lcidlc/src/Value.h
774775
lcidlc/interface_error_test.txt
775776
lcidlc/lclink.sh
776777
lcidlc/lclinktest.sh
777-
libcore/include/atlsubset.h
778-
libcore/include/core.h
779-
libcore/include/filesystem.h
780-
libcore/include/module.h
781-
libcore/include/sserialize.h
782-
libcore/include/sserialize_lnx.h
783-
libcore/include/sserialize_osx.h
784-
libcore/include/sserialize_w32.h
785-
libcore/include/thread.h
786-
libcore/include/thunk.h
787-
libcore/src/binary.cpp
788-
libcore/src/core.cpp
789-
libcore/src/filesystem.cpp
790-
libcore/src/module.cpp
791-
libcore/src/sserialize.cpp
792-
libcore/src/sserialize_lnx.cpp
793-
libcore/src/sserialize_osx.cpp
794-
libcore/src/sserialize_w32.cpp
795-
libcore/src/thread.cpp
796-
libcore/src/thunk.cpp
797-
libcore/score.txt
798778
libexternal/include/revolution/external.h
799779
libexternal/include/revolution/support.h
800780
libexternal/src/external.c
@@ -807,14 +787,17 @@ libexternalv1/src/external.c
807787
libexternalv1/score.txt
808788
libfoundation/include/foundation-auto.h
809789
libfoundation/include/foundation-inline.h
790+
libfoundation/include/foundation-locale.h
810791
libfoundation/include/foundation-stdlib.h
792+
libfoundation/include/foundation-unicode.h
811793
libfoundation/include/foundation.h
812794
libfoundation/src/foundation-array.cpp
813795
libfoundation/src/foundation-core.cpp
814796
libfoundation/src/foundation-data.cpp
815797
libfoundation/src/foundation-debug.cpp
816798
libfoundation/src/foundation-error.cpp
817799
libfoundation/src/foundation-list.cpp
800+
libfoundation/src/foundation-locale.cpp
818801
libfoundation/src/foundation-name.cpp
819802
libfoundation/src/foundation-nativechars.cpp
820803
libfoundation/src/foundation-number.cpp
@@ -824,6 +807,8 @@ libfoundation/src/foundation-stream.cpp
824807
libfoundation/src/foundation-string-cf.cpp
825808
libfoundation/src/foundation-string.cpp
826809
libfoundation/src/foundation-unicodechars.cpp
810+
libfoundation/src/foundation-unicode.cpp
811+
libfoundation/src/foundation-unicode-private.h
827812
libfoundation/src/foundation-value.cpp
828813
libfoundation/score.txt
829814
prebuilt/bin/perfect.exe

Livecode.includes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
engine/include
22
engine/src
33
lcidlc/src
4-
libcore/include
54
libexternal/include/revolution
65
libexternalv1/include
76
libfoundation/include

engine/src/dsklnx.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1869,13 +1869,16 @@ class MCLinuxDesktop: public MCSystemInterface
18691869
while (t_success && (direntp = readdir64(dirptr)) != NULL)
18701870
{
18711871
MCSystemFolderEntry p_entry;
1872+
MCStringRef t_unicode_name;
18721873

18731874
if (MCCStringEqual(direntp->d_name, "."))
18741875
continue;
18751876
struct stat buf;
18761877
stat(direntp->d_name, &buf);
18771878

1878-
p_entry.name = direntp -> d_name;
1879+
MCStringCreateWithSysString(direntp -> d_name, t_unicode_name);
1880+
1881+
p_entry.name = t_unicode_name;
18791882
p_entry.data_size = buf.st_size;
18801883
p_entry.modification_time = (uint32_t)buf.st_mtime;
18811884
p_entry.access_time = (uint32_t)buf.st_atime;
@@ -1885,6 +1888,8 @@ class MCLinuxDesktop: public MCSystemInterface
18851888
p_entry.is_folder = S_ISDIR(buf.st_mode);
18861889

18871890
t_success = p_callback(x_context, &p_entry);
1891+
1892+
MCValueRelease(t_unicode_name);
18881893
}
18891894

18901895
closedir(dirptr);

engine/src/globals.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,19 +1011,19 @@ bool X_open(int argc, MCStringRef argv[], MCStringRef envp[])
10111011
else
10121012
delete newtheme;
10131013
}
1014-
1015-
MCsystemprinter = MCprinter = MCscreen -> createprinter();
1016-
MCprinter -> Initialize();
1017-
1018-
// MM-2013-09-03: [[ RefactorGraphics ]] Initialize graphics library.
1019-
MCGraphicsInitialize();
1020-
10211014
// Create the basic locale and the system locale
10221015
if (!MCLocaleCreateWithName(MCSTR("en_US"), kMCBasicLocale))
10231016
return false;
10241017
kMCSystemLocale = MCS_getsystemlocale();
10251018
if (kMCSystemLocale == nil)
10261019
return false;
1020+
1021+
MCsystemprinter = MCprinter = MCscreen -> createprinter();
1022+
MCprinter -> Initialize();
1023+
1024+
// MM-2013-09-03: [[ RefactorGraphics ]] Initialize graphics library.
1025+
MCGraphicsInitialize();
1026+
10271027

10281028
// MW-2009-07-02: Clear the result as a startup failure will be indicated
10291029
// there.

0 commit comments

Comments
 (0)