ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.138 by root, Sat Dec 9 21:26:46 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
36 59
37use CFPlus; 60use CFPlus;
38use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
39use CFPlus::Protocol; 62use CFPlus::Protocol;
40use CFPlus::UI; 63use CFPlus::UI;
64use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList;
41use CFPlus::Pod; 66use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 67use CFPlus::MapWidget;
68use CFPlus::Macro;
44 69
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 70$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 71$SIG{PIPE} = 'IGNORE';
47 72
48$Event::Eval = 0; 73$Event::Eval = 0;
49$Event::DIED = sub { 74$Event::DIED = sub {
50 # TODO: display dialog box or so 75 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 76};
55 77
56my $MAX_FPS = 60; 78my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
58 80
59our $META_SERVER = "crossfire.real-time.com:13326"; 81our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 82
61our $LAST_REFRESH; 83our $LAST_REFRESH;
62our $NOW; 84our $NOW;
63 85
64our $CFG; 86our $CFG;
… …
102 124
103our $INVENTORY_PAGE; 125our $INVENTORY_PAGE;
104our $STATS_PAGE; 126our $STATS_PAGE;
105our $SKILL_PAGE; 127our $SKILL_PAGE;
106our $SPELL_PAGE; 128our $SPELL_PAGE;
129our $SPELL_LIST;
107 130
108our $HELP_WINDOW; 131our $HELP_WINDOW;
109our $MESSAGE_WINDOW; 132our $MESSAGE_WINDOW;
110our $FLOORBOX; 133our $FLOORBOX;
111our $GAUGES; 134our $GAUGES;
… …
124 147
125our $INV; 148our $INV;
126our $INVR; 149our $INVR;
127our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
128 151
129our $BIND_EDITOR;
130our $BIND_UPD_CB;
131
132our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
133 156
134sub status { 157sub status {
135 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 158 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
136} 159}
137 160
138sub debug { 161sub debug {
139 $DEBUG_STATUS->set_text ($_[0]); 162 $DEBUG_STATUS->set_text ($_[0]);
163}
164
165sub message {
166 my ($para) = @_;
167
168 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
169
170 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
171
172 $LOGVIEW->add_paragraph ($para);
173 $LOGVIEW->scroll_to_bottom;
140} 174}
141 175
142sub destroy_query_dialog { 176sub destroy_query_dialog {
143 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
144 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
… …
343 status "logging in..."; 377 status "logging in...";
344 378
345 $LOGIN_BUTTON->set_text ("Logout"); 379 $LOGIN_BUTTON->set_text ("Logout");
346 $SETUP_DIALOG->hide; 380 $SETUP_DIALOG->hide;
347 381
348 $PROFILE = $CFG->{profile}{default};
349
350 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
351 383
352 my ($host, $port) = split /:/, $PROFILE->{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
353 385
354 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
355 387
356 $CONN = eval { 388 $CONN = eval {
357 new CFPlus::Protocol 389 new CFPlus::Protocol
358 host => $host, 390 host => $host,
359 port => $port || 13327, 391 port => $port || 13327,
… …
397sub stop_game { 429sub stop_game {
398 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
400 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
401 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
402 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
403 435
404 return unless $CONN; 436 return unless $CONN;
405 437
406 status "connection closed"; 438 status "connection closed";
407 439
… …
634 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
636 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
637 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
638 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
639 672
640 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
641 674
642 for my $x (0..2) { 675 for my $x (0..2) {
643 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
647 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
648 ); 681 );
649 } 682 }
650 } 683 }
651 684
685 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
652 686
653 $table 687 $table
654} 688}
655 689
656sub stats_window { 690sub stats_window {
… …
825 859
826 my $table = $METASERVER->{table}; 860 my $table = $METASERVER->{table};
827 $table->clear; 861 $table->clear;
828 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 862 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
829 863
830 my $buf; 864 my $ok = 0;
831 865
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 866 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent;
833 868
834 unless ($fh) { 869 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 870 } sub {
836 return; 871 my ($msg) = @_;
837 } 872 if ($msg) {
838
839 Event->io (fd => $fh, poll => 'r', cb => sub {
840 my $res = sysread $fh, $buf, 8192, length $buf;
841
842 if (!defined $res) {
843 $_[0]->w->cancel;
844 $label->set_text ("error while retrieving server list: $!");
845 } elsif ($res == 0) {
846 $_[0]->w->cancel;
847 status "server list retrieved";
848
849 utf8::decode $buf if utf8::valid $buf;
850
851 $table->clear; 873 $table->clear;
852 874
853 my @tip = ( 875 my @tip = (
854 "The current number of users logged in on the server.", 876 "The current number of users logged in on the server.",
855 "The hostname of the server.", 877 "The hostname of the server.",
… …
865 for 0 .. $#col; 887 for 0 .. $#col;
866 888
867 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
868 890
869 my $y = 0; 891 my $y = 0;
870 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} }
898 ) {
871 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
872 901
873 for ($desc) { 902 for ($desc) {
874 s/<br>/\n/gi; 903 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 904 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 905 s/<.*?>//sgi;
877 s/&/&amp;/g; 906 s/&amp;/&/g;
878 s/</&lt;/g; 907 s/&lt;/</g;
879 s/>/&gt;/g; 908 s/&gt;/>/g;
880 } 909 }
881 910
882 $uptime = sprintf "%dd %02d:%02d:%02d", 911 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 912 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 913 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 914 (int $uptime / 60) % 60,
886 $m->[8] % 60; 915 $uptime % 60;
887 916
888 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
889 918
890 $y++; 919 $y++;
891 920
… …
901 ), 930 ),
902 (new CFPlus::UI::Empty expand => 1), 931 (new CFPlus::UI::Empty expand => 1),
903 ]); 932 ]);
904 933
905 $table->add ($_, $y, new CFPlus::UI::Label 934 $table->add ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 936 ellipsise => 0,
907 align => $align[$_], 937 align => $align[$_],
908 text => $m->[$_], 938 text => $m->[$_],
909 tooltip => $tip[$_], 939 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 941 can_hover => 1,
911 can_events => 1, 942 can_events => 1,
912 fontsize => 0.8) 943 fontsize => 0.8)
913 for 0 .. $#$m; 944 for 0 .. $#$m;
914 } 945 }
946 } else {
947 $ok or $label->set_text ("error while contacting metaserver");
915 } 948 }
916 }); 949 };
950
917} 951}
918 952
919sub metaserver_dialog { 953sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 954 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 955 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 959 title => "Server List",
926 name => 'metaserver_dialog', 960 name => 'metaserver_dialog',
927 x => 'center', 961 x => 'center',
928 y => 'center', 962 y => 'center',
929 z => 3, 963 z => 3,
964 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 965 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 966 child => $vbox,
932 has_close_button => 1, 967 has_close_button => 1,
933 table => $table, 968 table => $table,
934 on_visibility_change => sub { 969 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 970 update_metaserver ($_[0]) if $_[1];
… …
1156 ["Boots" => PICKUP_BOOTS], 1191 ["Boots" => PICKUP_BOOTS],
1157 ["Gloves" => PICKUP_GLOVES], 1192 ["Gloves" => PICKUP_GLOVES],
1158 ["Cloaks" => PICKUP_CLOAK], 1193 ["Cloaks" => PICKUP_CLOAK],
1159 ], 1194 ],
1160 1195
1161 ["Readables", 2, 2, 1196 ["Readables", 2, 0,
1162 ["Spellbooks" => PICKUP_SPELLBOOK], 1197 ["Spellbooks" => PICKUP_SPELLBOOK],
1163 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1198 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1164 ["Normal Books/Scrolls" => PICKUP_READABLES], 1199 ["Normal Books/Scrolls" => PICKUP_READABLES],
1165 ], 1200 ],
1166 ["Misc", 2, 7, 1201 ["Misc", 2, 5,
1167 ["Food" => PICKUP_FOOD], 1202 ["Food" => PICKUP_FOOD],
1168 ["Drinks" => PICKUP_DRINK], 1203 ["Drinks" => PICKUP_DRINK],
1169 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1204 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1170 ["Keys" => PICKUP_KEY], 1205 ["Keys" => PICKUP_KEY],
1171 ["Magical Items" => PICKUP_MAGICAL], 1206 ["Magical Items" => PICKUP_MAGICAL],
1172 ["Potions" => PICKUP_POTION], 1207 ["Potions" => PICKUP_POTION],
1173 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1208 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1174 ["Ignore cursed" => PICKUP_NOT_CURSED], 1209 ["Ignore cursed" => PICKUP_NOT_CURSED],
1175 ["Jewelery" => PICKUP_JEWELS], 1210 ["Jewelery" => PICKUP_JEWELS],
1211 ["Flesh" => PICKUP_FLESH],
1176 ], 1212 ],
1177 ["Weight/Value ratio", 2, 17] 1213 ["Weight/Value ratio", 2, 17]
1178 ) 1214 )
1179 { 1215 {
1180 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
… …
1230 $table 1266 $table
1231} 1267}
1232 1268
1233my %SORT_ORDER = ( 1269my %SORT_ORDER = (
1234 type => undef, 1270 type => undef,
1235 mtime => sub { sort { 1271 mtime => sub {
1272 my $NOW = time;
1273 sort {
1274 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1275 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1276
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1277 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1278 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1279 or $a->{type} <=> $b->{type}
1280 } @_
1239 } @_ }, 1281 },
1240 weight => sub { sort { 1282 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1283 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1284 or $a->{type} <=> $b->{type}
1243 } @_ }, 1285 } @_ },
1244); 1286);
… …
1269 #TODO# update to weigh/maxweight 1311 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1312 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1313
1272 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1314 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory); 1315 $sw1->add ($INV = new CFPlus::UI::Inventory);
1316 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1274 1317
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1318 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1319
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1320 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1321
… …
1318 $ntb->add ( 1361 $ntb->add (
1319 "Skills (F3)" => $SKILL_PAGE = skill_window, 1362 "Skills (F3)" => $SKILL_PAGE = skill_window,
1320 "Shows all your Skills." 1363 "Shows all your Skills."
1321 ); 1364 );
1322 1365
1323 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1366 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1325 $ntb->add ( 1368 $ntb->add (
1326 "Spellbook (F4)" => $spellsw, 1369 "Spellbook (F4)" => $spellsw,
1327 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1370 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1328 ); 1371 );
1329 $ntb->add ( 1372 $ntb->add (
… …
1336 1379
1337 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1338 $plwin 1381 $plwin
1339} 1382}
1340 1383
1341sub update_bindings {
1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1343}
1344
1345sub keyboard_setup { 1384sub keyboard_setup {
1346 my $binding_list = new CFPlus::UI::VBox; 1385 CFPlus::Macro::keyboard_setup
1347
1348 my $refresh;
1349 $refresh = $BIND_UPD_CB = sub {
1350 $binding_list->clear ();
1351
1352 return unless $PROFILE;
1353
1354 for my $mod (keys %{$PROFILE->{bindings}}) {
1355 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1356 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1357 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1358
1359 my $lbl = join "; ", @$cmds;
1360 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1361 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1362 $hb->add (new CFPlus::UI::Button
1363 text => "delete",
1364 tooltip => "Deletes the binding",
1365 on_activate => sub {
1366 $binding_list->remove ($hb);
1367 delete $PROFILE->{bindings}{$mod}{$sym};
1368 0
1369 });
1370
1371 $hb->add (new CFPlus::UI::Button
1372 text => "edit",
1373 tooltip => "Edits the binding",
1374 on_activate => sub {
1375 $::BIND_EDITOR->set_binding (
1376 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1377 sub {
1378 my ($nmod, $nsym, $ncmds) = @_;
1379 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1380 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1381 $refresh->();
1382 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1383 $SETUP_DIALOG->show;
1384 },
1385 sub {
1386 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1387 $SETUP_DIALOG->show;
1388 });
1389 $::BIND_EDITOR->show;
1390 $SETUP_DIALOG->hide;
1391 0
1392 });
1393
1394 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1395 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1396 }
1397 }
1398 };
1399
1400 my $vb = new CFPlus::UI::VBox;
1401 $vb->add (new CFPlus::UI::FancyFrame
1402 label => "Options",
1403 child => (my $hb = new CFPlus::UI::HBox),
1404 );
1405 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1406 $hb->add (new CFPlus::UI::CheckBox
1407 expand => 1,
1408 state => $CFG->{shift_fire_stop},
1409 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1410 on_changed => sub {
1411 my ($cbox, $value) = @_;
1412 $CFG->{shift_fire_stop} = $value;
1413 0
1414 });
1415
1416 $vb->add (new CFPlus::UI::FancyFrame
1417 label => "Bindings",
1418 child => $binding_list);
1419 $vb->add (my $hb = new CFPlus::UI::HBox);
1420
1421 $hb->add (new CFPlus::UI::Button
1422 text => "record new",
1423 expand => 1,
1424 tooltip => "This button opens the binding editor with an empty binding.",
1425 on_activate => sub {
1426 $::BIND_EDITOR->set_binding (undef, undef, [],
1427 sub {
1428 my ($mod, $sym, $cmds) = @_;
1429 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1430 $refresh->();
1431 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1432 $SETUP_DIALOG->show;
1433 },
1434 sub {
1435 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1436 $SETUP_DIALOG->show;
1437 },
1438 );
1439 $SETUP_DIALOG->hide;
1440 $::BIND_EDITOR->show;
1441 0
1442 },
1443 );
1444
1445 $hb->add (new CFPlus::UI::Button
1446 text => "close",
1447 tooltip => "Closes the binding window",
1448 expand => 1,
1449 on_activate => sub {
1450 $SETUP_DIALOG->hide;
1451 0
1452 }
1453 );
1454
1455 $refresh->();
1456
1457 $vb
1458} 1386}
1459 1387
1460sub help_window { 1388sub help_window {
1461 my $win = new CFPlus::UI::Toplevel 1389 my $win = new CFPlus::UI::Toplevel
1462 x => 'center', 1390 x => 'center',
… …
1647 1575
1648 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1649 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1650 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1651 1579
1652 $vbox->add (my $table = new CFPlus::UI::Table); 1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1653 1581
1654 $table->add (0, 0, new CFPlus::UI::Button 1582 $table->add (0, 0, new CFPlus::UI::Button
1655 text => "Close", 1583 text => "Close",
1656 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1584 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1657 on_activate => $close, 1585 on_activate => $close,
1658 ); 1586 );
1659 1587
1660 $table->add (2, 0, new CFPlus::UI::Button 1588 $table->add (2, 0, new CFPlus::UI::Button
1661 text => "Next", 1589 text => "Next",
1662 tooltip => "Show the next <b>Tip of the day</b>.", 1590 tooltip => "Show the next <b>Tip of the day</b>.",
1663 on_activate => sub { 1591 on_activate => sub {
1664 $close->(); 1592 $close->();
1665 &show_tip_of_the_day; 1593 &show_tip_of_the_day;
1666 }, 1594 },
… …
1708 padding => 0, 1636 padding => 0,
1709 z => 100, 1637 z => 100,
1710 force_x => "max", 1638 force_x => "max",
1711 force_y => 0; 1639 force_y => 0;
1712 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1713
1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1715 1641
1716 $STATUSBOX = new CFPlus::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1717 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1643 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1718 1644
1719 (new CFPlus::UI::Frame 1645 (new CFPlus::UI::Frame
… …
1820 ); 1746 );
1821 1747
1822 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1823 tooltip => "View Documentation"); 1749 tooltip => "View Documentation");
1824 1750
1751
1825 $BUTTONBAR->add (new CFPlus::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1826 text => "Quit", 1753 text => "Quit",
1827 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1828 on_activate => sub { 1755 on_activate => sub {
1829 if ($CONN) { 1756 if ($CONN) {
… …
1840 } 1767 }
1841 1768
1842 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1769 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1843} 1770}
1844 1771
1772sub setup_build_button {
1773 my ($enabled) = @_;
1774 if ($enabled) {
1775 $BUILD_BUTTON ||= new CFPlus::UI::Button
1776 text => "Build",
1777 tooltip => "Opens the ingame builder",
1778 on_activate => sub {
1779 if ($CONN) {
1780 $CONN->send_ext_req (builder_player_items => sub {
1781 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1782 });
1783 }
1784 0
1785 };
1786 $BUTTONBAR->add ($BUILD_BUTTON);
1787 } else {
1788 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1789 }
1790}
1791
1792sub open_ingame_editor {
1793 my ($msg) = @_;
1794
1795 my $win = new CFPlus::UI::Toplevel
1796 x => 0,
1797 y => 'center',
1798 z => 4,
1799 name => 'builder_window',
1800 force_w => int $WIDTH * 1/4,
1801 force_h => int $HEIGHT * 3/4,
1802 title => "In game builder",
1803 has_close_button => 1;
1804
1805 my $r = new CFPlus::UI::ScrolledWindow (
1806 expand => 1,
1807 scroll_y => 1
1808 );
1809 $r->add (my $vb = new CFPlus::UI::VBox);
1810 $win->add ($r);
1811
1812
1813 $vb->add (
1814 new CFPlus::UI::Button
1815 text => "Disable build mode",
1816 on_activate => sub { $::IN_BUILD_MODE = undef }
1817 );
1818 $vb->add (
1819 new CFPlus::UI::Button
1820 text => "ERASE",
1821 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1822 );
1823
1824 for my $itemarchname (
1825 sort {
1826 $msg->{items}->{$a}->{build_arch_name}
1827 cmp $msg->{items}->{$b}->{build_arch_name}
1828 } keys %{$msg->{items}}
1829 ) {
1830 my $info = $msg->{items}->{$itemarchname};
1831 $vb->add (
1832 new CFPlus::UI::Button text => $info->{build_arch_name},
1833 on_activate => sub {
1834 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1835
1836 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1837 build_mode_query_arch_info ();
1838 }
1839 }
1840 );
1841 }
1842
1843 $win->show;
1844}
1845
1846sub build_mode_query_arch_info {
1847 my ($iteminfo) = $::IN_BUILD_MODE;
1848 my $itemarchname = $iteminfo->{item};
1849 my $info = $iteminfo->{info};
1850
1851 my $dialog = new CFPlus::UI::Toplevel
1852 x => "center",
1853 y => "center",
1854 z => 50,
1855 force_w => int $WIDTH * 1/2,
1856 title => "Enter information for placement of '$itemarchname'",
1857 has_close_button => 1;
1858
1859 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1860
1861 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1862 my $row = 0;
1863 if ($info->{has_name}) {
1864 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1865 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1866 }
1867 if ($info->{has_text}) {
1868 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1869 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1870 }
1871 if ($info->{has_connection}) {
1872 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1873 $table->add (1, $row++,
1874 new CFPlus::UI::Entry
1875 expand => 1,
1876 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1877 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1878 );
1879 }
1880
1881 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1882 $hb->add (new CFPlus::UI::Button
1883 text => "Close",
1884 expand => 1,
1885 on_activate => sub { $dialog->hide; 0 },
1886 );
1887 $dialog->show;
1888}
1889
1845sub video_shutdown { 1890sub video_shutdown {
1846 CFPlus::OpenGL::shutdown; 1891 CFPlus::OpenGL::shutdown;
1847 1892
1848 undef $SDL_ACTIVE; 1893 undef $SDL_ACTIVE;
1849} 1894}
… …
1880 CFPlus::Mix_AllocateChannels 8; 1925 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1926 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 1927
1883 audio_music_finished; 1928 audio_music_finished;
1884 1929
1930 local $_;
1885 while (<$fh>) { 1931 while (<$fh>) {
1886 next if /^\s*#/; 1932 next if /^\s*#/;
1887 next if /^\s*$/; 1933 next if /^\s*$/;
1888 1934
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 1935 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1974 }, 2020 },
1975 CFPlus::SDL_VIDEOEXPOSE => sub { 2021 CFPlus::SDL_VIDEOEXPOSE => sub {
1976 CFPlus::UI::full_refresh; 2022 CFPlus::UI::full_refresh;
1977 }, 2023 },
1978 CFPlus::SDL_ACTIVEEVENT => sub { 2024 CFPlus::SDL_ACTIVEEVENT => sub {
1979# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2025# not useful, as APPACTIVE include sonly iconified state, not unmapped
2026# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2027# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2028# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2029# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1980 }, 2030 },
1981 CFPlus::SDL_KEYDOWN => sub { 2031 CFPlus::SDL_KEYDOWN => sub {
1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2032 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1983 # alt-enter 2033 # alt-enter
1984 $FULLSCREEN_ENABLE->toggle; 2034 $FULLSCREEN_ENABLE->toggle;
… …
2023 log_fontsize => 0.7, 2073 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2074 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2075 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2076 stat_fontsize => 0.7,
2027 mapsize => 100, 2077 mapsize => 100,
2028 say_command => 'say', 2078 say_command => 'chat',
2029 audio_enable => 1, 2079 audio_enable => 1,
2030 bgm_enable => 1, 2080 bgm_enable => 1,
2031 bgm_volume => 0.25, 2081 bgm_volume => 0.25,
2032 face_prefetch => 0, 2082 face_prefetch => 0,
2033 output_sync => 1, 2083 output_sync => 1,
… …
2041 while (my ($k, $v) = each %DEF_CFG) { 2091 while (my ($k, $v) = each %DEF_CFG) {
2042 $CFG->{$k} = $v unless exists $CFG->{$k}; 2092 $CFG->{$k} = $v unless exists $CFG->{$k};
2043 } 2093 }
2044 2094
2045 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2095 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2096 $PROFILE = $CFG->{profile}{default};
2097
2098 # convert old bindings (only default profile matters)
2099 if (my $bindings = delete $PROFILE->{bindings}) {
2100 while (my ($mod, $syms) = each %$bindings) {
2101 while (my ($sym, $cmds) = each %$syms) {
2102 push @{ $PROFILE->{macro} }, {
2103 accelkey => [$mod*1, $sym*1],
2104 action => $cmds,
2105 };
2106 }
2107 }
2108 }
2046 2109
2047 sdl_init; 2110 sdl_init;
2048 2111
2049 @SDL_MODES = reverse 2112 @SDL_MODES = reverse
2050 grep $_->[0] >= 640 && $_->[1] >= 480, 2113 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2087# } 2150# }
2088# my $t2 = Time::HiRes::time; 2151# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2152# warn $t2-$t1;
2090# } 2153# }
2091 2154
2155 $startup_done->();
2156
2092 video_init; 2157 video_init;
2093 audio_init; 2158 audio_init;
2094} 2159}
2095 2160
2096show_tip_of_the_day if $CFG->{show_tips}; 2161show_tip_of_the_day if $CFG->{show_tips};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines