-
Notifications
You must be signed in to change notification settings - Fork 5
/
wesnoth-1.10.1-nacl.patch
1024 lines (982 loc) · 37.2 KB
/
wesnoth-1.10.1-nacl.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index e0cb746..9aac538 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -707,7 +707,9 @@ const std::string &get_cache_dir()
{
if (cache_dir.empty())
{
-#if defined(_X11) && !defined(PREFERENCES_DIR)
+#ifdef __native_client__
+ cache_dir = "/wesnoth-userdata/cache";
+#elif defined(_X11) && !defined(PREFERENCES_DIR)
char const *xdg_cache = getenv("XDG_CACHE_HOME");
if (!xdg_cache || xdg_cache[0] == '\0') {
xdg_cache = getenv("HOME");
@@ -885,7 +887,7 @@ file_tree_checksum::file_tree_checksum()
file_tree_checksum::file_tree_checksum(const config& cfg) :
nfiles (lexical_cast_default<size_t>(cfg["nfiles"])),
- sum_size(lexical_cast_default<size_t>(cfg["size"])),
+ sum_size(lexical_cast_default<size_t>(cfg["size"].str().substr(1, std::string::npos))),
modified(lexical_cast_default<time_t>(cfg["modified"]))
{
}
@@ -893,7 +895,7 @@ file_tree_checksum::file_tree_checksum(const config& cfg) :
void file_tree_checksum::write(config& cfg) const
{
cfg["nfiles"] = lexical_cast<std::string>(nfiles);
- cfg["size"] = lexical_cast<std::string>(sum_size);
+ cfg["size"] = "i" + lexical_cast<std::string>(sum_size);
cfg["modified"] = lexical_cast<std::string>(modified);
}
diff --git a/src/nacl/SConscript b/src/nacl/SConscript
index c3e7f85..c627187 100644
--- a/src/nacl/SConscript
+++ b/src/nacl/SConscript
@@ -1,7 +1,5 @@
Import("env")
-env.Append(CPPPATH=["#/src/nacl/generated", "#/src/nacl"])
-
libwesnoth_nacl = env.Library("wesnoth_nacl", ["plugin.cc"])
Return("libwesnoth_nacl")
diff --git a/src/nacl/dir_list.h b/src/nacl/dir_list.h
deleted file mode 100644
index fe282fb..0000000
--- a/src/nacl/dir_list.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Intentionally empty */
-
diff --git a/src/nacl/file_list.h b/src/nacl/file_list.h
deleted file mode 100644
index fe282fb..0000000
--- a/src/nacl/file_list.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Intentionally empty */
-
diff --git a/src/nacl/pack_list.h b/src/nacl/pack_list.h
deleted file mode 100644
index fe282fb..0000000
--- a/src/nacl/pack_list.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Intentionally empty */
-
diff --git a/src/nacl/plugin.cc b/src/nacl/plugin.cc
index fcea550..db6057e 100644
--- a/src/nacl/plugin.cc
+++ b/src/nacl/plugin.cc
@@ -21,26 +21,7 @@ extern int wesnoth_main(int argc, char **argv);
#include <nacl-mounts/base/MainThreadRunner.h>
#include <nacl-mounts/http2/HTTP2Mount.h>
#include <nacl-mounts/pepper/PepperMount.h>
-
-
-const char* http_dirs[] = {
-#include <dir_list.h>
-};
-
-struct http_file_info {
- const char* path;
- size_t size;
-} http_files[] = {
-#include <file_list.h>
-};
-
-struct http_pack_info {
- const char* path;
- const char* pack_path;
- off_t offset;
-} http_packs[] = {
-#include <pack_list.h>
-};
+#include <nacl-mounts/buffer/BufferMount.h>
class PluginInstance : public pp::Instance {
@@ -50,9 +31,11 @@ class PluginInstance : public pp::Instance {
width_(0),
height_(0),
progress_handler_(this),
- directory_reader_(this) {
+ directory_reader_(this),
+ http2_files_(""),
+ http2_files2_("") {
RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE);
- RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
+ RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_WHEEL | PP_INPUTEVENT_CLASS_KEYBOARD);
proxy_ = KernelProxy::KPInstance();
runner_ = new MainThreadRunner(this);
@@ -68,16 +51,26 @@ class PluginInstance : public pp::Instance {
}
}
- virtual void DidChangeView(const pp::Rect& position, const pp::Rect& clip) {
- fprintf(stderr, "did change view, new %dx%d, old %dx%d\n",
- position.size().width(), position.size().height(),
- width_, height_);
+ virtual void DidChangeFocus(bool has_focus) {
+ fprintf(stderr, "focus: %d\n", has_focus);
+ fflush(stderr);
+ SDL_NACL_SetHasFocus(has_focus);
+ }
+
+ virtual void DidChangeView(const pp::View& view) {
+// const pp::Rect& position, const pp::Rect& clip) {
+ fprintf(stderr, "did change view, new %dx%d, old %dx%d; %s, %s\n",
+ view.GetRect().width(), view.GetRect().height(),
+ width_, height_,
+ view.IsVisible() ? "plugin visible" : "plugin invisible",
+ view.IsPageVisible() ? "page visible" : "page invisible");
fflush(stderr);
- width_ = position.size().width();
- height_ = position.size().height();
+ width_ = view.GetRect().width();
+ height_ = view.GetRect().height();
SDL_NACL_SetInstance(pp_instance(), width_, height_);
+ SDL_NACL_SetPageVisible(view.IsPageVisible());
if (sdl_thread_started_ == false) {
// It seems this call to SDL_Init is required. Calling from
@@ -101,7 +94,17 @@ class PluginInstance : public pp::Instance {
directory_reader_.HandleResponse(s);
}
- bool Init(int argc, const char* argn[], const char* argv[]) {
+ bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
+ for (int i = 0; i < argc; ++i) {
+ std::string s = argn[i];
+ if (s == "http2_files") {
+ http2_files_ = argv[i];
+ } else if (s == "http2_files2") {
+ http2_files2_ = argv[i];
+ }
+ }
+ fprintf(stderr, "http2_files='%s'\n", http2_files_.c_str());
+ fflush(stderr);
return true;
}
@@ -113,6 +116,8 @@ class PluginInstance : public pp::Instance {
KernelProxy* proxy_;
MainThreadRunner* runner_;
pp::FileSystem* fs_;
+ std::string http2_files_;
+ std::string http2_files2_;
static void* sdl_thread_static(void* param) {
return reinterpret_cast<PluginInstance*>(param)->sdl_thread();
@@ -123,55 +128,49 @@ class PluginInstance : public pp::Instance {
fflush(stderr);
// Setup writable homedir.
- PepperMount* pepper_mount = new PepperMount(runner_, fs_, 20 * 1024 * 1024);
- pepper_mount->SetDirectoryReader(&directory_reader_);
- pepper_mount->SetPathPrefix("/wesnoth-userdata");
+ PepperMount* rw_mount = new PepperMount(runner_, fs_, 20 * 1024 * 1024);
+ rw_mount->SetDirectoryReader(&directory_reader_);
+ rw_mount->SetPathPrefix("/wesnoth-userdata");
proxy_->mkdir("/wesnoth-userdata", 0777);
- int res = proxy_->mount("/wesnoth-userdata", pepper_mount);
+ // 20Mb NaCl-side memory cache.
+ int res = proxy_->mount("/wesnoth-userdata", new BufferMount(rw_mount, 4096, 5120));
// The following lines can be removed when nacl-mounts starts intercepting mkdir() calls.
+ proxy_->mkdir("/wesnoth-userdata/cache", 0777);
proxy_->mkdir("/wesnoth-userdata/saves", 0777);
// Setup r/o data directory in /usr/local/share/wesnoth
- HTTP2Mount* http2_mount = new HTTP2Mount(runner_, "./usr/local/share/wesnoth");
- http2_mount->SetLocalCache(fs_, 350*1024*1024, "/wesnoth0", true);
- http2_mount->SetProgressHandler(&progress_handler_);
+ HTTP2Mount* ro_mount = new HTTP2Mount(runner_, "./usr/local/share/wesnoth");
+ ro_mount->SetLocalCache(fs_, 350*1024*1024, "/wesnoth0", true);
+ ro_mount->SetProgressHandler(&progress_handler_);
fprintf(stderr, "Registering known files.\n");
- fflush(stderr);
- for (int i = 0; i < sizeof(http_dirs) / sizeof(*http_dirs); ++i) {
- char* path = (char*)http_dirs[i];
- if (path && *path)
- http2_mount->AddDir(path);
- }
-
- for (int i = 0; i < sizeof(http_files) / sizeof(*http_files); ++i) {
- char* path = (char*)http_files[i].path;
- size_t size = http_files[i].size;
- if (path && *path)
- http2_mount->AddFile(path, size);
- }
-
- for (int i = 0; i < sizeof(http_packs) / sizeof(*http_packs); ++i) {
- char* path = (char*)http_packs[i].path;
- char* pack_path = (char*)http_packs[i].pack_path;
- off_t offset = http_packs[i].offset;
- if (path && *path) {
- http2_mount->SetInPack(path, pack_path, offset);
- }
- }
-
- http2_mount->SetInMemory("/fonts/Andagii.ttf", true);
- http2_mount->SetInMemory("/fonts/DejaVuSans.ttf", true);
- http2_mount->SetInMemory("/fonts/wqy-zenhei.ttc", true);
+ ro_mount->ReadManifest(http2_files_);
fprintf(stderr, "Mounting the filesystem.\n");
fflush(stderr);
proxy_->mkdir("/usr", 0777);
proxy_->mkdir("/usr/local", 0777);
proxy_->mkdir("/usr/local/share", 0777);
- res = proxy_->mount("/usr/local/share/wesnoth", http2_mount);
+ // 100Mb NaCl-side memory cache.
+ res = proxy_->mount("/usr/local/share/wesnoth", new BufferMount(ro_mount, 1048576, 100));
+
+ // Setup r/o data directory in /lib/locale
+ HTTP2Mount* ro_mount2 = new HTTP2Mount(runner_, "./lib/locale");
+ ro_mount2->SetLocalCache(fs_, 350*1024*1024, "/locale0", true);
+ ro_mount2->SetProgressHandler(&progress_handler_);
+
+ fprintf(stderr, "Registering known files.\n");
+ ro_mount2->ReadManifest(http2_files2_);
+
+ fprintf(stderr, "Mounting the filesystem.\n");
+ fflush(stderr);
+ proxy_->mkdir("/lib", 0777);
+ proxy_->mkdir("/lib/locale", 0777);
+ // 10Mb NaCl-side memory cache.
+ res = proxy_->mount("/lib/locale", new BufferMount(ro_mount2, 1048576, 10));
+
if (!res) {
fprintf(stderr, "FS initialization success.\n");
} else {
diff --git a/utils/nacl/build.sh b/utils/nacl/build.sh
index 7a69098..70107c0 100755
--- a/utils/nacl/build.sh
+++ b/utils/nacl/build.sh
@@ -5,11 +5,12 @@
set -e -x
+NACL_TOOLCHAIN_ROOT=$NACL_SDK_ROOT/toolchain/linux_x86_glibc
ROOT=${NACL_TOOLCHAIN_ROOT:-$HOME/root/nacl-sdk}
PATH=$ROOT/bin:$ROOT/x86_64-nacl/usr/bin:$PATH
-PKG_CONFIG_PATH=$ROOT/x86_64-nacl/usr/lib/pkgconfig scons -j15 host=x86_64-nacl \
+PKG_CONFIG_PATH=$ROOT/x86_64-nacl/usr/lib/pkgconfig scons -j5 host=x86_64-nacl \
boostdir=$ROOT/x86_64-nacl/usr/include/boost \
- boostlibdir=$ROOT/x86_64-nacl/usr/lib sdldir=$ROOT/x86_64-nacl/usr nls=no \
+ boostlibdir=$ROOT/x86_64-nacl/usr/lib sdldir=$ROOT/x86_64-nacl/usr \
destdir=$ROOT/x86_64-nacl \
build=release wesnoth install
diff --git a/utils/nacl/build32.sh b/utils/nacl/build32.sh
index d7571e2..b8ec53e 100755
--- a/utils/nacl/build32.sh
+++ b/utils/nacl/build32.sh
@@ -5,10 +5,11 @@
set -e -x
+NACL_TOOLCHAIN_ROOT=$NACL_SDK_ROOT/toolchain/linux_x86_glibc
ROOT=${NACL_TOOLCHAIN_ROOT:-$HOME/root/nacl-sdk}
PATH=$ROOT/bin:$ROOT/i686-nacl/usr/bin:$PATH
-PKG_CONFIG_PATH=$ROOT/i686-nacl/usr/lib/pkgconfig scons -j15 host=i686-nacl \
+PKG_CONFIG_PATH=$ROOT/i686-nacl/usr/lib/pkgconfig scons -j5 host=i686-nacl \
boostdir=$ROOT/i686-nacl/usr/include/boost \
boostlibdir=$ROOT/i686-nacl/usr/lib sdldir=$ROOT/i686-nacl/usr nls=no \
destdir=$ROOT/i686-nacl \
diff --git a/utils/nacl/buildpack.py b/utils/nacl/buildpack.py
deleted file mode 100644
index a603e40..0000000
--- a/utils/nacl/buildpack.py
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the NaCl-LICENSE file.
-
-import shutil
-import glob
-import os
-import fnmatch
-import sys
-
-
-# pack description format: [root_mask, file_name_mask, file_path_exclusion_mask]
-# pack will contain
-# all files under (and including) the expansion of root_mask,
-# whose names match file_name_mask,
-# whose full path (with root_mask) does not match full_path_exclusion_mask
-pack0_masks = [
- ['data/languages', '*', ''],
- ['data/hardwired', '*', ''],
- ['images/game-icon.png', '*', ''],
- ['images/cursors-bw', '*', ''],
- ['images/misc/logo.png', '*', ''],
- ]
-
-pack1_masks = [
- ['images', '*', ''],
- ['data/*.cfg', '*', ''],
- ['data/gui', '*', ''],
- ['data/themes', '*.cfg', ''],
- ['data/core', '*.cfg', ''],
- ['data/COPYING.txt', '*', ''],
- ['data/core/images/maps/wesnoth.png', '*', ''],
- ['data/ai', '*', ''],
- ['data/campaigns', '_main.cfg', ''],
- ['sounds/button.wav', '*', ''],
- ['sounds/select.wav', '*', ''],
- ]
-
-# These files are needed to display the campaign list.
-pack2_masks = [
- ['data/core/images/misc', '*', ''],
- ['data/campaigns', 'campaign_image.png', ''],
- ['data/campaigns', 'campaign_image.jpg', ''],
- ['data/core/images/units/human-loyalists/knight.png', '*', ''],
- ['data/core/images/units/elves-wood/lord.png', '*', ''],
- ['data/core/images/units/human-outlaws/fugitive.png', '*', ''],
- ['data/core/images/units/elves-wood/high-lord.png', '*', ''],
- ['data/core/images/units/human-loyalists/general.png', '*', ''],
- ['data/core/images/units/human-magi/elder-mage.png', '*', ''],
- ['data/core/images/units/undead/soulless-swimmer.png', '*', ''],
- ['data/core/images/units/orcs/ruler.png', '*', ''],
- ['data/campaigns/Heir_To_The_Throne/images/units/konrad-lord-leading.png', '*', ''],
- ['data/campaigns/The_South_Guard/images/deoran/horseman-commander-defend.png', '*', ''],
- ['data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png', '*', ''],
- ['data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-lord.png', '*', ''],
- ['data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh.png', '*', ''],
- ['data/core/images/items/hammer-runic.png', '*', ''],
- ['data/core/images/items/sceptre-of-fire.png', '*', ''],
- ['data/core/images/scenery/dwarven-doors-closed.png', '*', ''],
- ]
-
-pack3_masks = [
- ['data', '*.cfg', ''],
- ['data/core/images/terrain', '*', ''],
- ['data/core/images/themes', '*', ''],
- ['data/lua', '*', ''],
- ['sounds', '*', ''],
- ]
-
-pack4_masks = [
- ['data/core/sounds', '*', ''],
- ]
-
-packs = [pack0_masks, pack1_masks, pack2_masks, pack3_masks, pack4_masks]
-
-
-all_files = set()
-
-def list_path_with_mask(path, mask, exclude_mask):
- files = set()
- if os.path.isdir(path):
- for (dirpath, dirnames, filenames) in os.walk(path):
- for filename in filenames:
- if fnmatch.fnmatch(filename, mask) and not fnmatch.fnmatch(os.path.join(dirpath, filename), exclude_mask):
- files.add(os.path.join(dirpath, filename))
- else:
- if fnmatch.fnmatch(path, mask) and not fnmatch.fnmatch(path, exclude_mask):
- files.add(path)
-
- return files
-
-def list_pack_contents(masks):
- files = set()
- for (root_path, mask, exclude_mask) in masks:
- roots = glob.glob(root_path)
- for root in roots:
- new_files = list_path_with_mask(root, mask, exclude_mask).difference(all_files)
- files.update(new_files)
- all_files.update(new_files)
- return files
-
-
-def build_pack(files, out):
- fout = open(out, "w")
- out_list = []
- sz = 0
- for f in files:
- data = open(f).read()
- fout.write(data)
- out_list.append('{"/%s", "/%s", %d},\n' % (f, out, sz))
- sz += len(data)
- fout.close()
- print '%s: %d files, %d bytes total' % (out, len(files), sz)
-
- return ''.join(out_list)
-
-
-
-base_dir = sys.argv[1]
-out_list = os.path.join(os.getcwd(), 'src/nacl/generated/pack_list.h')
-os.chdir(base_dir)
-
-# define additional packs
-
-packs.append([['data/core/images/units', '*', ''], ['data/core/images/attacks', '*', '']])
-
-for path in glob.glob(os.path.join(base_dir, 'data/campaigns/*')):
- path = path[len(base_dir):]
- print 'Campaign: ' + path
- packs.append([[path, '*', '']])
-
-packs.append([['data/core/images/portraits/humans', '*', '']])
-packs.append([['data/core/images/portraits', '*', '']])
-packs.append([['data/core/images', '*', '']])
-packs.append([['data', '*', 'data/core/music/*']])
-
-# build packs
-fout_list = open(out_list, 'w')
-for (index, pack) in enumerate(packs):
- pack_files = list_pack_contents(pack)
- out_list_data = build_pack(pack_files, 'pack' + str(index))
- fout_list.write(out_list_data)
-fout_list.write('{"", "", 0}\n')
-fout_list.close()
diff --git a/utils/nacl/fsconfig.py b/utils/nacl/fsconfig.py
new file mode 100644
index 0000000..f7f7ecd
--- /dev/null
+++ b/utils/nacl/fsconfig.py
@@ -0,0 +1,97 @@
+#!/usr/bin/python
+# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the NaCl-LICENSE file.
+
+import glob
+import os
+
+
+srcdir = os.path.join(os.environ['NACL_TOOLCHAIN_ROOT'], 'x86_64-nacl/usr/local/share/wesnoth')
+destdir = os.path.abspath('inst/usr/local/share/wesnoth')
+manifest = "_files"
+
+# pack description format: [root_mask, file_name_mask, file_path_exclusion_mask]
+# pack will contain
+# all files under (and including) the expansion of root_mask,
+# whose names match file_name_mask,
+# whose full path (with root_mask) does not match full_path_exclusion_mask
+packs = []
+
+packs.append([
+ ['data/languages', '*', ''],
+ ['data/hardwired', '*', ''],
+ ['images/game-icon.png', '*', ''],
+ ['images/cursors-bw', '*', ''],
+ ['images/misc/logo.png', '*', ''],
+ ])
+
+packs.append([
+ ['images', '*', ''],
+ ['data/*.cfg', '*', ''],
+ ['data/gui', '*', ''],
+ ['data/themes', '*.cfg', ''],
+ ['data/core', '*.cfg', ''],
+ ['data/COPYING.txt', '*', ''],
+ ['data/core/images/maps/wesnoth.png', '*', ''],
+ ['data/ai', '*', ''],
+ ['data/campaigns', '_main.cfg', ''],
+ ['sounds/button.wav', '*', ''],
+ ['sounds/select.wav', '*', ''],
+ ])
+
+# These files are needed to display the campaign list.
+packs.append([
+ ['data/core/images/misc', '*', ''],
+ ['data/campaigns', 'campaign_image.png', ''],
+ ['data/campaigns', 'campaign_image.jpg', ''],
+ ['data/core/images/units/human-loyalists/knight.png', '*', ''],
+ ['data/core/images/units/elves-wood/lord.png', '*', ''],
+ ['data/core/images/units/human-outlaws/fugitive.png', '*', ''],
+ ['data/core/images/units/elves-wood/high-lord.png', '*', ''],
+ ['data/core/images/units/human-loyalists/general.png', '*', ''],
+ ['data/core/images/units/human-magi/elder-mage.png', '*', ''],
+ ['data/core/images/units/undead/soulless-swimmer.png', '*', ''],
+ ['data/core/images/units/orcs/ruler.png', '*', ''],
+ ['data/campaigns/Heir_To_The_Throne/images/units/konrad-lord-leading.png', '*', ''],
+ ['data/campaigns/The_South_Guard/images/deoran/horseman-commander-defend.png', '*', ''],
+ ['data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png', '*', ''],
+ ['data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-lord.png', '*', ''],
+ ['data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh.png', '*', ''],
+ ['data/core/images/items/hammer-runic.png', '*', ''],
+ ['data/core/images/items/sceptre-of-fire.png', '*', ''],
+ ['data/core/images/scenery/dwarven-doors-closed.png', '*', ''],
+ ])
+
+packs.append([
+ ['data', '*.cfg', ''],
+ ['data/core/images/terrain', '*', ''],
+ ['data/core/images/themes', '*', ''],
+ ['data/lua', '*', ''],
+ ['sounds', '*', ''],
+ ])
+
+packs.append([['data/core/sounds', '*', '']])
+
+packs.append([['data/core/images/units', '*', ''], ['data/core/images/attacks', '*', '']])
+
+# A pack for each campaign.
+for path in glob.glob(os.path.join(srcdir, 'data/campaigns/*')):
+ path = path[len(srcdir):]
+ if path[0] == '/':
+ path = path[1:]
+ print 'Campaign: ' + path
+ packs.append([[path, '*', '']])
+
+packs.append([['data/core/images/portraits/humans', '*', '']])
+packs.append([['data/core/images/portraits', '*', '']])
+packs.append([['data/core/images', '*', '']])
+packs.append([['data', '*', 'data/core/music/*']])
+
+# Translations.
+for path in glob.glob(os.path.join(srcdir, 'translations/*')):
+ path = path[len(srcdir):]
+ if path[0] == '/':
+ path = path[1:]
+ print 'Translation: ' + path
+ packs.append([[path, '*', '']])
diff --git a/utils/nacl/fsconfig2.py b/utils/nacl/fsconfig2.py
new file mode 100644
index 0000000..1fc717e
--- /dev/null
+++ b/utils/nacl/fsconfig2.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the NaCl-LICENSE file.
+
+import glob
+import os
+
+
+srcdir = os.path.join(os.environ['NACL_TOOLCHAIN_ROOT'], 'x86_64-nacl/lib/locale')
+destdir = os.path.abspath('inst/lib/locale')
+manifest = "_files"
+
+# pack description format: [root_mask, file_name_mask, file_path_exclusion_mask]
+# pack will contain
+# all files under (and including) the expansion of root_mask,
+# whose names match file_name_mask,
+# whose full path (with root_mask) does not match full_path_exclusion_mask
+packs = []
+
+# System locales.
+for path in glob.glob(os.path.join(srcdir, '*')):
+ path = path[len(srcdir):]
+ if path[0] == '/':
+ path = path[1:]
+ print 'Locale: ' + path
+ packs.append([[path, '*', '']])
+
diff --git a/utils/nacl/genfs.sh b/utils/nacl/genfs.sh
deleted file mode 100755
index 0b3d9e0..0000000
--- a/utils/nacl/genfs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the NaCl-LICENSE file.
-
-BASE=$NACL_SDK_ROOT/toolchain/linux_x86/x86_64-nacl
-DIRS_OUT=src/nacl/generated/dir_list.h
-FILES_OUT=src/nacl/generated/file_list.h
-(cd $BASE/usr/local/share/wesnoth; find -type d) | perl -pe 's/^\.//' | perl -pe 's/^(.*)$/"$1",/' >$DIRS_OUT
-echo "" >>$DIRS_OUT
-(cd $BASE/usr/local/share/wesnoth; find -type f -printf "%p %s\n") | perl -pe 's/^\.//' | perl -pe 's/^(.*) (\d+)$/{"$1", $2},/' >$FILES_OUT
-echo '{"", 0}' >>$FILES_OUT
-
diff --git a/utils/nacl/howto b/utils/nacl/howto
index 6f6bfbf..b449e63 100644
--- a/utils/nacl/howto
+++ b/utils/nacl/howto
@@ -2,8 +2,8 @@ Building Wesnoth for NativeClient.
1. Get the NaCl SDK from http://code.google.com/chrome/nativeclient/
Setup enviroment:
-NACL_SDK_ROOT=<path to sdk>
-NACL_TOOLCHAIN_ROOT=$NACL_SDK_ROOT/pepper_15/toolchain/linux_x86
+export NACL_SDK_ROOT=<path to sdk>
+export NACL_TOOLCHAIN_ROOT=$NACL_SDK_ROOT/pepper_15/toolchain/linux_x86
2. Get naclports: http://code.google.com/p/naclports/
Build the ports for both x86_64 and i686:
@@ -13,24 +13,26 @@ This will install all prerequisites under $NACL_TOOLCHAIN_ROOT.
3. Build Wesnoth.
./utils/nacl/build.sh # build and install under $NACL_TOOLCHAIN_ROOT
+./utils/nacl/build32.sh # build the 32-bit binary
+cp wesnoth $NACL_TOOLCHAIN_ROOT/x86_64-nacl/usr/local/bin/wesnoth32
+
+3.5 Optional: build system locales
+This is required to get game in languages other than English.
+NaCl SDK comes without any prebuilt locales. This may take a while.
+Get eglibc-2.9 source, and build localedef program with --exec-prefix=$NACL_TOOLCHAIN_ROOT/x86_64-nacl.
+Then,
+cd $NACL_TOOLCHAIN_ROOT/x86_64-nacl
+mkdir -p lib/locale
+gunzip share/i18n/charmaps/UTF-8.gz
+for i in `cd share/i18n/locales; ls`; do
+ echo $i; /path/to/localedef -f UTF-8 -i $i --no-archive $i.UTF-8;
+done
+4. Deploy
# Scan installed files, pack them in bundles.
# You can't realistically download 13000 small files over HTTP.
-mkdir -p src/nacl/generated
-./utils/nacl/buildpack.py $NACL_TOOLCHAIN_ROOT/x86_64-nacl/usr/local/share/wesnoth/
-./utils/nacl/genfs
-
-# Rebuild Wesnoth with the generated file metadata.
-./utils/nacl/build.sh
-
-# Build 32-bit version. No need to repeat the scanning step.
-./utils/nacl/build32.sh
-cp wesnoth $NACL_TOOLCHAIN_ROOT/x86_64-nacl/usr/local/share/bin/wesnoth32
-
-4. Deploy
-Copy stuff from utils/nacl/static to $NACL_TOOLCHAIN_ROOT/x86_64-nacl
-
-./install.sh inst
+# This will place Wesnoth binaries and packed data under inst/.
+./utils/nacl/install.sh
Upload inst/ to any static file hosting.
Open wesnoth.html in Chromium >= 15. At the moment you need to either enable NativeClient in
diff --git a/utils/nacl/install.sh b/utils/nacl/install.sh
index 8f887bc..43a853b 100755
--- a/utils/nacl/install.sh
+++ b/utils/nacl/install.sh
@@ -1,48 +1,29 @@
#!/bin/bash
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the NaCl-LICENSE file.
-
set -e
-DST=$1
-
-if [ z$DST == z ]; then
- echo "Need dstdir"
- exit 1
-fi
-
-if [ -d $DST ]; then
- echo "$DST already exists"
- exit 1
-fi
-
+DST=inst
+export NACL_TOOLCHAIN_ROOT=$NACL_SDK_ROOT/toolchain/linux_x86_glibc
ROOT=$NACL_TOOLCHAIN_ROOT/x86_64-nacl
-WESNOTH=$ROOT/usr/local/share/wesnoth
-mkdir $DST
-cp -v $ROOT/wesnoth.html $DST/
-cp -v $ROOT/wesnoth.nmf $DST/
-cp -v $ROOT/wesnoth.js $DST/
-cp -v $ROOT/check_browser.js $DST/
-cp -v $ROOT/peppermount_helper.js $DST/
+rm -rf $DST
+$ROOT/usr/lib/nacl-mounts/util/genfs.py ./utils/nacl/fsconfig.py
+$ROOT/usr/lib/nacl-mounts/util/genfs.py ./utils/nacl/fsconfig2.py
+INDEX=`(cd $DST/usr/local/share/wesnoth && ls _files*)`
+INDEXX=`(cd $DST/lib/locale && ls _files*)`
+echo $INDEX
+echo $INDEXX
+
+cp utils/nacl/static/* $DST/
+echo "http2_files='/$INDEX';" >$DST/fs.js
+echo "http2_files2='/$INDEXX';" >>$DST/fs.js
mkdir -p $DST/usr/local/bin/
cp -v $ROOT/usr/local/bin/wesnoth $ROOT/usr/local/bin/wesnoth32 $DST/usr/local/bin/
mkdir $DST/lib32 $DST/lib64
-for lib in `cat $ROOT/wesnoth.nmf | grep '"url": "lib32' | perl -pe 's/^.*?url": "lib32\/(.*)".*/$1/'`; do
+for lib in `cat $DST/wesnoth.nmf | grep '"url": "lib32' | perl -pe 's/^.*?url": "lib32\/(.*)".*/$1/'`; do
cp -v $ROOT/lib32/$lib $DST/lib32/$lib
done
-for lib in `cat $ROOT/wesnoth.nmf | grep '"url": "lib64' | perl -pe 's/^.*?url": "lib64\/(.*)".*/$1/'`; do
+for lib in `cat $DST/wesnoth.nmf | grep '"url": "lib64' | perl -pe 's/^.*?url": "lib64\/(.*)".*/$1/'`; do
cp -v $ROOT/lib64/$lib $DST/lib64/$lib
done
-
-mkdir -p $DST/usr/local/share/wesnoth
-cp -v $ROOT/usr/local/share/wesnoth/pack* $DST/usr/local/share/wesnoth/
-
-mkdir -p $DST/usr/local/share/wesnoth/data/core/music/
-cp -rv $ROOT/usr/local/share/wesnoth/data/core/music/* $DST/usr/local/share/wesnoth/data/core/music/
-
-mkdir -p $DST/usr/local/share/wesnoth/fonts/
-cp -rv $ROOT/usr/local/share/wesnoth/fonts/* $DST/usr/local/share/wesnoth/fonts/
diff --git a/utils/nacl/static/check_browser.js b/utils/nacl/static/check_browser.js
index 2e735b7..9636ad0 100644
--- a/utils/nacl/static/check_browser.js
+++ b/utils/nacl/static/check_browser.js
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2011 The Native Client Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
- * found in the NaCl-LICENSE file.
+ * found in the LICENSE file.
*/
/**
diff --git a/utils/nacl/static/peppermount_helper.js b/utils/nacl/static/peppermount_helper.js
index 1f542db..a831ddd 100644
--- a/utils/nacl/static/peppermount_helper.js
+++ b/utils/nacl/static/peppermount_helper.js
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2011 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the NaCl-LICENSE file.
- */
-
function toArray(list) {
return Array.prototype.slice.call(list || [], 0);
}
@@ -39,8 +33,8 @@ function errorHandler(e) {
function listResults(entries) {
s = ''
entries.forEach(function(entry, i) {
- s += entry.name;
- s += '\n';
+ s += entry.name;
+ s += '\n';
});
console.log('entries: ' + s);
document.getElementById('wesnoth').postMessage(s);
diff --git a/utils/nacl/static/wesnoth.html b/utils/nacl/static/wesnoth.html
index 54b6866..e485d61 100644
--- a/utils/nacl/static/wesnoth.html
+++ b/utils/nacl/static/wesnoth.html
@@ -1,28 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
- <!--
- Copyright (c) 2011 The Native Client Authors. All rights reserved.
- Use of this source code is governed by a BSD-style license that can be
- found in the NaCl-LICENSE file.
- -->
- <head>
- <title>Wesnoth NativeClient demo</title>
- <script type="text/javascript" src="check_browser.js"></script>
- </head>
- <body style="color:gray;background-color:#776655">
- <div id="nacl_div" style="text-align:center">
- <canvas id="progress_bar"
- width="1024" height="20">
- Your browser does not support HTML5 Canvas.
- </canvas>
- </div>
+ <head>
+ <style>
+ html,body { position:relative; background-color:#222201; width:100%; height:100%; overflow:auto; margin:0; padding:0; }
+ #container { position:relative; background-color:#222201; display:table; width:100%; height:100%; overflow:auto;}
+ #outer { position:relative; display:table-cell; vertical-align:middle; text-align:center; }
+ #inner { position:relative; width:800px; height:480px; margin-left:auto; margin-right:auto; }
+ #nacl_div { position:absolute; top:0; left:0; }
+ #menu { position:absolute; bottom:0px; height:50px; width:800px; left:0; }
+ #logo { position:absolute; top:-13px; left:0; }
+ #console { position:absolute; display:table-cell; font-family:sans-serif, helvetica, arial; color:white; font-size:10px; text-align:center; top:10px; border:1px #999999 solid; left:230px; }
+ #console p { position:relative; top:3px; margin:0;padding:0; }
+ #console_loader { position:absolute; background-color:#ffffff; opacity:0.15; top:10px; left:231px; height:22px; }
+ #links { position: absolute; top:10px; right:5px; width: 250px; height:20px; }
+ #links .fs { position:absolute; right:0; margin:0; padding:0; cursor:pointer;}
+ #links .source { position:absolute; top:3px; right:35px; margin:0; padding:0; }
+ #links .native { position:absolute; top:3px; right:110px; margin:0; padding:0; }
+ #links .url { position:absolute; top:3px; right:190px; margin:0; padding:0; }
+ </style>
+ <script type="text/javascript" src="check_browser.js"></script>
+ </head>
+ <body>
+ <div id="container">
+ <div id="outer">
+ <div id="inner">
+ <div id="nacl_div" style="-webkit-box-shadow: 0px 0px 160px #6c6c6c;"></div>
+ <div id="menu">
+ <a href="http://www.wesnoth.org" target="_blank"><img id="logo" src="wesnoth_logo.png"/></a>
+ <div id="console_loader"></div>
+ <div id="console"><p>Trying To Initialize</p></div>
+ <div id="links">
+ <a href="http://www.wesnoth.org" target="_blank"><img class="url" src="wesnoth_url.png"/></a>
+ <a href="http://code.google.com/chrome/nativeclient" target="_blank"><img class="native" src="wesnoth_native.png"/></a>
+ <a href="https://github.com/eugenis/wesnoth-nacl-build" target="_blank"><img class="source" src="wesnoth_source.png"/></a>
+ <img id="toggle" class="fs" src="wesnoth_fs.png"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
- <script src="peppermount_helper.js"></script>
- <script src="wesnoth.js"></script>
+ <script src="fs.js"></script>
+ <script src="peppermount_helper.js"></script>
+ <script src="wesnoth.js"></script>
- <p style="text-align:center">
- <a href="http://www.wesnoth.org">Wesnoth</a> |
- <a href="http://code.google.com/chrome/nativeclient">NativeClient</a>
- </body>
-</HTML>
+ </body>
+</html>
diff --git a/utils/nacl/static/wesnoth.js b/utils/nacl/static/wesnoth.js
index bf26385..af4dcd4 100644
--- a/utils/nacl/static/wesnoth.js
+++ b/utils/nacl/static/wesnoth.js
@@ -1,28 +1,78 @@
-/*
- * Copyright (c) 2011 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the NaCl-LICENSE file.
- */
+var gameWidth=1024, gameHeight=800;
+var consoleWidth=0;
+/*** detect screen size and load nacl module ***/
+function resizeNaclModule() {
+ var winWidth=document.width, winHeight=document.height;
+ var menuHeight=50;
+
+ /*** Resizes and element based on ID ***/
+ function resizeElement (id, width, height) {
+ document.getElementById(id).style.width = width + "px";
+ document.getElementById(id).style.height = height + "px";
+ }
+
+ /*** Resizes all game elements and containers based on game window dimensions ***/
+ function resizeAll (width, height) {
+
+ /* RESIZE CONTAINERS */
+ resizeElement("inner", width, height+menuHeight);
+ resizeElement("nacl_div", width, height);
+
+ gameWidth=width;
+ gameHeight=height;
+ resizeElement("menu", width, menuHeight);
+
+ /* RESIZE CONSOLE */
+ consoleWidth=width-520;
+ resizeElement("console", consoleWidth, 20);
+ }
+
+ /*** Resize elements based on window size ***/
+ /* TEMPORARILY DISABLED
+ if (winHeight > (768+menuHeight)) {
+ resizeAll(1024,768);
+ }
+ else if ((winHeight > (600+menuHeight)) && (winHeight < (768+menuHeight))) {
+ resizeAll(1024,600);
+ }
+ else if ((winHeight > (480+menuHeight)) && (winHeight < (600+menuHeight))) {
+ resizeAll(800,480);
+ }
+ else if (winHeight < (480+menuHeight)) {
+ resizeAll(800,480);
+ }
+ */
+ resizeAll(1024,800);
+
+ /*** Initialize fullscreen toggle ***/
+ var container = document.getElementById('container');
+ var toggleButton = document.getElementById('toggle');
+
+ toggleButton.onclick = function() {
+ if (screen.height === window.outerHeight) {
+ document.webkitCancelFullScreen();
+ }
+ else {
+ container.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
+ }
+ }
+
+ }
+
+
+/*** UPDATE PROGRESS BAR ***/
function updateProgressBar(percent, message, styleBackground,
styleForeground, styleText) {
console.log("message: " + message);
console.log("progress: " + percent + "%");
- var progress_bar =
- document.getElementById('progress_bar');
- var ctx = progress_bar.getContext('2d');
- var width = progress_bar.width;
- ctx.fillStyle = styleForeground ? styleForeground :
- "#52565a";
- ctx.fillRect(0, 0, percent * width, 20);
- ctx.fillStyle = styleBackground ? styleBackground :
- "#ddccbb";
- ctx.fillRect(percent * width, 0, width, 20);
- ctx.fillStyle = styleText ? styleText : "black";
- ctx.textAlign = "center";
- ctx.textBaseline = "middle";
- ctx.font = 'sans-serif';
- ctx.fillText(message, width / 2, 10, 3 * width / 4);
+
+ // update console message
+ document.getElementById('console').innerHTML = "<p>" + message + "</p>";
+
+ // update console loader bar
+ document.getElementById('console_loader').style.width = (consoleWidth * percent) + "px";
+
}
function HandleProgress(event) {
@@ -75,10 +125,12 @@ function requestQuotaAndStartWesnoth() {
var embed = document.createElement('embed');
embed.setAttribute('name', 'nacl_module');
embed.setAttribute('id', 'wesnoth');
- embed.setAttribute('width', 1024);
- embed.setAttribute('height', 800);
+ embed.setAttribute('width', gameWidth);
+ embed.setAttribute('height', gameHeight);
embed.setAttribute('src', 'wesnoth.nmf');
embed.setAttribute('type', 'application/x-nacl');
+ embed.setAttribute('http2_files', http2_files);
+ embed.setAttribute('http2_files2', http2_files2);
var div = document.getElementById("nacl_div");
div.appendChild(embed);
div.addEventListener('progress', HandleProgress, true);
@@ -138,6 +190,11 @@ function checkBrowser() {
return isValidBrowser && browserSupportStatus == browser_version.BrowserChecker.StatusValues.NACL_ENABLED;
}
-if (checkBrowser())
- requestQuotaAndStartWesnoth();
+
+/*** resize window ***/
+resizeNaclModule();
+
+/*** Initialize NaCl module ***/
+if (checkBrowser()) requestQuotaAndStartWesnoth();
+
diff --git a/utils/nacl/static/wesnoth.nmf b/utils/nacl/static/wesnoth.nmf
index a452854..1044722 100644
--- a/utils/nacl/static/wesnoth.nmf
+++ b/utils/nacl/static/wesnoth.nmf
@@ -4,29 +4,29 @@
"x86-64": {"url": "lib64/runnable-ld.so"}
},
"files": {
- "libc.so.5e6ad7ea" : {
- "x86-32" : {"url": "lib32/libc.so.5e6ad7ea"},
- "x86-64" : {"url": "lib64/libc.so.5e6ad7ea"}
+ "libc.so.3c8d1f2e" : {
+ "x86-32" : {"url": "lib32/libc.so.3c8d1f2e"},
+ "x86-64" : {"url": "lib64/libc.so.3c8d1f2e"}
},
- "libdl.so.5e6ad7ea" : {
- "x86-32" : {"url": "lib32/libdl.so.5e6ad7ea"},
- "x86-64" : {"url": "lib64/libdl.so.5e6ad7ea"}
+ "libdl.so.3c8d1f2e" : {
+ "x86-32" : {"url": "lib32/libdl.so.3c8d1f2e"},
+ "x86-64" : {"url": "lib64/libdl.so.3c8d1f2e"}
},
- "librt.so.5e6ad7ea" : {
- "x86-32" : {"url": "lib32/librt.so.5e6ad7ea"},
- "x86-64" : {"url": "lib64/librt.so.5e6ad7ea"}