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.124 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.141 by elmex, Sat Dec 16 17:33:26 2006 UTC

… …
21 } 21 }
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26
27use Carp 'verbose';
26 28
27# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
28BEGIN { 30BEGIN {
29 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
30 @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
… …
57 59
58use CFPlus; 60use CFPlus;
59use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
60use CFPlus::Protocol; 62use CFPlus::Protocol;
61use CFPlus::UI; 63use CFPlus::UI;
64use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList;
62use CFPlus::Pod; 66use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 67use CFPlus::MapWidget;
68use CFPlus::Macro;
65 69
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 70$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 71$SIG{PIPE} = 'IGNORE';
68 72
69$Event::Eval = 0; 73$Event::Eval = 1;
70$Event::DIED = sub { 74$Event::DIED = sub {
71 # TODO: display dialog box or so 75 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 76};
76 77
77my $MAX_FPS = 60; 78my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
79 80
80our $META_SERVER = "crossfire.real-time.com:13326"; 81our $META_SERVER = "http://metaserver.schmorp.de/current.json";
81 82
82our $LAST_REFRESH; 83our $LAST_REFRESH;
83our $NOW; 84our $NOW;
84 85
85our $CFG; 86our $CFG;
… …
123 124
124our $INVENTORY_PAGE; 125our $INVENTORY_PAGE;
125our $STATS_PAGE; 126our $STATS_PAGE;
126our $SKILL_PAGE; 127our $SKILL_PAGE;
127our $SPELL_PAGE; 128our $SPELL_PAGE;
129our $SPELL_LIST;
128 130
129our $HELP_WINDOW; 131our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 132our $MESSAGE_WINDOW;
131our $FLOORBOX; 133our $FLOORBOX;
132our $GAUGES; 134our $GAUGES;
… …
145 147
146our $INV; 148our $INV;
147our $INVR; 149our $INVR;
148our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
149 151
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
154 156
155sub status { 157sub status {
156 $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]);
157} 159}
158 160
… …
174sub destroy_query_dialog { 176sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
177} 179}
178 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
179# server query dialog 184# server query dialog
180sub server_query { 185sub server_query {
181 my ($conn, $flags, $prompt) = @_; 186 my ($conn, $flags, $prompt) = @_;
187
188 # FIXME: a very ugly hack to wait for stat update #d#
189 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
190 unless ($QUERY_TIMER) {
191 $QUERY_TIMER =
192 Event->timer (
193 after => 1,
194 cb => sub {
195 server_query ($conn, $flags, $prompt, 1);
196 $QUERY_TIMER = undef
197 }
198 );
199 return;
200 }
201 }
182 202
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 204 x => "center",
185 y => "center", 205 y => "center",
186 title => "Server Query", 206 title => "Server Query",
… …
375 status "logging in..."; 395 status "logging in...";
376 396
377 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
379 399
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 400 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 401
384 my ($host, $port) = split /:/, $PROFILE->{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
385 403
386 $MAP = new CFPlus::Map; 404 $MAP = new CFPlus::Map;
… …
429sub stop_game { 447sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
435 453
436 return unless $CONN; 454 return unless $CONN;
437 455
438 status "connection closed"; 456 status "connection closed";
439 457
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 685 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 686 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 687 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 688 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
689 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
671 690
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 692
674 for my $x (0..2) { 693 for my $x (0..2) {
675 for my $y (0 .. 2) { 694 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 698 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 699 );
681 } 700 }
682 } 701 }
683 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 704
685 $table 705 $table
686} 706}
687 707
688sub stats_window { 708sub stats_window {
… …
857 877
858 my $table = $METASERVER->{table}; 878 my $table = $METASERVER->{table};
859 $table->clear; 879 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 880 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 881
862 my $buf; 882 my $ok = 0;
863 883
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 884 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent;
865 886
866 unless ($fh) { 887 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 888 } sub {
868 return; 889 my ($msg) = @_;
869 } 890 if ($msg) {
870
871 Event->io (fd => $fh, poll => 'r', cb => sub {
872 my $res = sysread $fh, $buf, 8192, length $buf;
873
874 if (!defined $res) {
875 $_[0]->w->cancel;
876 $label->set_text ("error while retrieving server list: $!");
877 } elsif ($res == 0) {
878 $_[0]->w->cancel;
879 status "server list retrieved";
880
881 utf8::decode $buf if utf8::valid $buf;
882
883 $table->clear; 891 $table->clear;
884 892
885 my @tip = ( 893 my @tip = (
886 "The current number of users logged in on the server.", 894 "The current number of users logged in on the server.",
887 "The hostname of the server.", 895 "The hostname of the server.",
… …
897 for 0 .. $#col; 905 for 0 .. $#col;
898 906
899 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
900 908
901 my $y = 0; 909 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 910 for my $m (
911 sort {
912 $b->{version} <=> $a->{version}
913 or $b->{users} <=> $a->{users}
914 }
915 @{ $msg->{servers} }
916 ) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
904 919
905 for ($desc) { 920 for ($desc) {
906 s/<br>/\n/gi; 921 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 923 s/<.*?>//sgi;
909 s/&/&amp;/g; 924 s/&amp;/&/g;
910 s/</&lt;/g; 925 s/&lt;/</g;
911 s/>/&gt;/g; 926 s/&gt;/>/g;
912 } 927 }
913 928
914 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 930 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
918 $m->[8] % 60; 933 $uptime % 60;
919 934
920 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
921 936
922 $y++; 937 $y++;
923 938
… …
933 ), 948 ),
934 (new CFPlus::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
935 ]); 950 ]);
936 951
937 $table->add ($_, $y, new CFPlus::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 954 ellipsise => 0,
939 align => $align[$_], 955 align => $align[$_],
940 text => $m->[$_], 956 text => $m->[$_],
941 tooltip => $tip[$_], 957 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 959 can_hover => 1,
943 can_events => 1, 960 can_events => 1,
944 fontsize => 0.8) 961 fontsize => 0.8)
945 for 0 .. $#$m; 962 for 0 .. $#$m;
946 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
947 } 966 }
948 }); 967 };
968
949} 969}
950 970
951sub metaserver_dialog { 971sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 972 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 973 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 977 title => "Server List",
958 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
959 x => 'center', 979 x => 'center',
960 y => 'center', 980 y => 'center',
961 z => 3, 981 z => 3,
982 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 983 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 984 child => $vbox,
964 has_close_button => 1, 985 has_close_button => 1,
965 table => $table, 986 table => $table,
966 on_visibility_change => sub { 987 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
… …
1188 ["Boots" => PICKUP_BOOTS], 1209 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1210 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1211 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1212 ],
1192 1213
1193 ["Readables", 2, 2, 1214 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1215 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1216 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1217 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1218 ],
1198 ["Misc", 2, 7, 1219 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1220 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1221 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1222 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1223 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1224 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1225 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1226 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1227 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1228 ["Jewelery" => PICKUP_JEWELS],
1229 ["Flesh" => PICKUP_FLESH],
1208 ], 1230 ],
1209 ["Weight/Value ratio", 2, 17] 1231 ["Weight/Value ratio", 2, 17]
1210 ) 1232 )
1211 { 1233 {
1212 my ($title, $x, $y, @bits) = @$_; 1234 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1284 $table
1263} 1285}
1264 1286
1265my %SORT_ORDER = ( 1287my %SORT_ORDER = (
1266 type => undef, 1288 type => undef,
1267 mtime => sub { sort { 1289 mtime => sub {
1290 my $NOW = time;
1291 sort {
1292 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1293 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1294
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1295 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1296 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1297 or $a->{type} <=> $b->{type}
1298 } @_
1271 } @_ }, 1299 },
1272 weight => sub { sort { 1300 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1301 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1302 or $a->{type} <=> $b->{type}
1275 } @_ }, 1303 } @_ },
1276); 1304);
… …
1301 #TODO# update to weigh/maxweight 1329 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1330 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1331
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1332 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1333 $sw1->add ($INV = new CFPlus::UI::Inventory);
1334 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1335
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1336 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1337
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1338 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1339
… …
1350 $ntb->add ( 1379 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1380 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1381 "Shows all your Skills."
1353 ); 1382 );
1354 1383
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1384 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1385 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1386 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1387 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1388 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1389 );
1361 $ntb->add ( 1390 $ntb->add (
… …
1368 1397
1369 $plwin->add ($ntb); 1398 $plwin->add ($ntb);
1370 $plwin 1399 $plwin
1371} 1400}
1372 1401
1373sub update_bindings {
1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1375}
1376
1377sub keyboard_setup { 1402sub keyboard_setup {
1378 my $binding_list = new CFPlus::UI::VBox; 1403 CFPlus::Macro::keyboard_setup
1379
1380 my $refresh;
1381 $refresh = $BIND_UPD_CB = sub {
1382 $binding_list->clear ();
1383
1384 return unless $PROFILE;
1385
1386 for my $mod (keys %{$PROFILE->{bindings}}) {
1387 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1388 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1389 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1390
1391 my $lbl = join "; ", @$cmds;
1392 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1393 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1394 $hb->add (new CFPlus::UI::Button
1395 text => "delete",
1396 tooltip => "Deletes the binding",
1397 on_activate => sub {
1398 $binding_list->remove ($hb);
1399 delete $PROFILE->{bindings}{$mod}{$sym};
1400 0
1401 });
1402
1403 $hb->add (new CFPlus::UI::Button
1404 text => "edit",
1405 tooltip => "Edits the binding",
1406 on_activate => sub {
1407 $::BIND_EDITOR->set_binding (
1408 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1409 sub {
1410 my ($nmod, $nsym, $ncmds) = @_;
1411 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1412 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1413 $refresh->();
1414 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1415 $SETUP_DIALOG->show;
1416 },
1417 sub {
1418 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1419 $SETUP_DIALOG->show;
1420 });
1421 $::BIND_EDITOR->show;
1422 $SETUP_DIALOG->hide;
1423 0
1424 });
1425
1426 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1427 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1428 }
1429 }
1430 };
1431
1432 my $vb = new CFPlus::UI::VBox;
1433 $vb->add (new CFPlus::UI::FancyFrame
1434 label => "Options",
1435 child => (my $hb = new CFPlus::UI::HBox),
1436 );
1437 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1438 $hb->add (new CFPlus::UI::CheckBox
1439 expand => 1,
1440 state => $CFG->{shift_fire_stop},
1441 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1442 on_changed => sub {
1443 my ($cbox, $value) = @_;
1444 $CFG->{shift_fire_stop} = $value;
1445 0
1446 });
1447
1448 $vb->add (new CFPlus::UI::FancyFrame
1449 label => "Bindings",
1450 child => $binding_list);
1451 $vb->add (my $hb = new CFPlus::UI::HBox);
1452
1453 $hb->add (new CFPlus::UI::Button
1454 text => "record new",
1455 expand => 1,
1456 tooltip => "This button opens the binding editor with an empty binding.",
1457 on_activate => sub {
1458 $::BIND_EDITOR->set_binding (undef, undef, [],
1459 sub {
1460 my ($mod, $sym, $cmds) = @_;
1461 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1462 $refresh->();
1463 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1464 $SETUP_DIALOG->show;
1465 },
1466 sub {
1467 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1468 $SETUP_DIALOG->show;
1469 },
1470 );
1471 $SETUP_DIALOG->hide;
1472 $::BIND_EDITOR->show;
1473 0
1474 },
1475 );
1476
1477 $hb->add (new CFPlus::UI::Button
1478 text => "close",
1479 tooltip => "Closes the binding window",
1480 expand => 1,
1481 on_activate => sub {
1482 $SETUP_DIALOG->hide;
1483 0
1484 }
1485 );
1486
1487 $refresh->();
1488
1489 $vb
1490} 1404}
1491 1405
1492sub help_window { 1406sub help_window {
1493 my $win = new CFPlus::UI::Toplevel 1407 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1408 x => 'center',
… …
1679 1593
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683 1597
1684 $vbox->add (my $table = new CFPlus::UI::Table); 1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685 1599
1686 $table->add (0, 0, new CFPlus::UI::Button 1600 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close", 1601 text => "Close",
1688 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>.", 1602 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>.",
1689 on_activate => $close, 1603 on_activate => $close,
1690 ); 1604 );
1691 1605
1692 $table->add (2, 0, new CFPlus::UI::Button 1606 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next", 1607 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 1608 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 1609 on_activate => sub {
1696 $close->(); 1610 $close->();
1697 &show_tip_of_the_day; 1611 &show_tip_of_the_day;
1698 }, 1612 },
… …
1740 padding => 0, 1654 padding => 0,
1741 z => 100, 1655 z => 100,
1742 force_x => "max", 1656 force_x => "max",
1743 force_y => 0; 1657 force_y => 0;
1744 $DEBUG_STATUS->show; 1658 $DEBUG_STATUS->show;
1745
1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1747 1659
1748 $STATUSBOX = new CFPlus::UI::Statusbox; 1660 $STATUSBOX = new CFPlus::UI::Statusbox;
1749 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1661 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1750 1662
1751 (new CFPlus::UI::Frame 1663 (new CFPlus::UI::Frame
… …
1852 ); 1764 );
1853 1765
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1766 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1767 tooltip => "View Documentation");
1856 1768
1769
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1770 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1771 text => "Quit",
1859 tooltip => "Terminates the program", 1772 tooltip => "Terminates the program",
1860 on_activate => sub { 1773 on_activate => sub {
1861 if ($CONN) { 1774 if ($CONN) {
… …
1872 } 1785 }
1873 1786
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1787 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1788}
1876 1789
1790sub setup_build_button {
1791 my ($enabled) = @_;
1792 if ($enabled) {
1793 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1794 $BUILD_BUTTON ||= new CFPlus::UI::Button
1795 text => "Build",
1796 tooltip => "Opens the ingame builder",
1797 on_activate => sub {
1798 if ($CONN) {
1799 $CONN->send_ext_req (builder_player_items => sub {
1800 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1801 });
1802 }
1803 0
1804 };
1805 $BUTTONBAR->add ($BUILD_BUTTON);
1806 } else {
1807 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1808 }
1809}
1810
1811sub open_ingame_editor {
1812 my ($msg) = @_;
1813
1814 my $win = new CFPlus::UI::Toplevel
1815 x => 0,
1816 y => 'center',
1817 z => 4,
1818 name => 'builder_window',
1819 force_w => int $WIDTH * 1/4,
1820 force_h => int $HEIGHT * 3/4,
1821 title => "In game builder",
1822 has_close_button => 1;
1823
1824 my $r = new CFPlus::UI::ScrolledWindow (
1825 expand => 1,
1826 scroll_y => 1
1827 );
1828 $r->add (my $vb = new CFPlus::UI::VBox);
1829 $win->add ($r);
1830
1831
1832 $vb->add (
1833 new CFPlus::UI::Button
1834 text => "Disable build mode",
1835 on_activate => sub { $::IN_BUILD_MODE = undef }
1836 );
1837 $vb->add (
1838 new CFPlus::UI::Button
1839 text => "ERASE",
1840 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1841 );
1842
1843 for my $itemarchname (
1844 sort {
1845 $msg->{items}->{$a}->{build_arch_name}
1846 cmp $msg->{items}->{$b}->{build_arch_name}
1847 } keys %{$msg->{items}}
1848 ) {
1849 my $info = $msg->{items}->{$itemarchname};
1850 $vb->add (
1851 new CFPlus::UI::Button text => $info->{build_arch_name},
1852 on_activate => sub {
1853 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1854
1855 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1856 build_mode_query_arch_info ();
1857 }
1858 }
1859 );
1860 }
1861
1862 $win->show;
1863}
1864
1865sub build_mode_query_arch_info {
1866 my ($iteminfo) = $::IN_BUILD_MODE;
1867 my $itemarchname = $iteminfo->{item};
1868 my $info = $iteminfo->{info};
1869
1870 my $dialog = new CFPlus::UI::Toplevel
1871 x => "center",
1872 y => "center",
1873 z => 50,
1874 force_w => int $WIDTH * 1/2,
1875 title => "Enter information for placement of '$itemarchname'",
1876 has_close_button => 1;
1877
1878 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1879
1880 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1881 my $row = 0;
1882 if ($info->{has_name}) {
1883 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1884 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1885 }
1886 if ($info->{has_text}) {
1887 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1888 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1889 }
1890 if ($info->{has_connection}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1892 $table->add (1, $row++,
1893 new CFPlus::UI::Entry
1894 expand => 1,
1895 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1896 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1897 );
1898 }
1899
1900 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1901 $hb->add (new CFPlus::UI::Button
1902 text => "Close",
1903 expand => 1,
1904 on_activate => sub { $dialog->hide; 0 },
1905 );
1906 $dialog->show;
1907}
1908
1877sub video_shutdown { 1909sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 1910 CFPlus::OpenGL::shutdown;
1879 1911
1880 undef $SDL_ACTIVE; 1912 undef $SDL_ACTIVE;
1881} 1913}
… …
1912 CFPlus::Mix_AllocateChannels 8; 1944 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1945 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 1946
1915 audio_music_finished; 1947 audio_music_finished;
1916 1948
1949 local $_;
1917 while (<$fh>) { 1950 while (<$fh>) {
1918 next if /^\s*#/; 1951 next if /^\s*#/;
1919 next if /^\s*$/; 1952 next if /^\s*$/;
1920 1953
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 1954 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2006 }, 2039 },
2007 CFPlus::SDL_VIDEOEXPOSE => sub { 2040 CFPlus::SDL_VIDEOEXPOSE => sub {
2008 CFPlus::UI::full_refresh; 2041 CFPlus::UI::full_refresh;
2009 }, 2042 },
2010 CFPlus::SDL_ACTIVEEVENT => sub { 2043 CFPlus::SDL_ACTIVEEVENT => sub {
2011# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2044# not useful, as APPACTIVE include sonly iconified state, not unmapped
2045# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2046# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2047# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2048# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2012 }, 2049 },
2013 CFPlus::SDL_KEYDOWN => sub { 2050 CFPlus::SDL_KEYDOWN => sub {
2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2051 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2015 # alt-enter 2052 # alt-enter
2016 $FULLSCREEN_ENABLE->toggle; 2053 $FULLSCREEN_ENABLE->toggle;
… …
2055 log_fontsize => 0.7, 2092 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2093 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2094 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2095 stat_fontsize => 0.7,
2059 mapsize => 100, 2096 mapsize => 100,
2060 say_command => 'say', 2097 say_command => 'chat',
2061 audio_enable => 1, 2098 audio_enable => 1,
2062 bgm_enable => 1, 2099 bgm_enable => 1,
2063 bgm_volume => 0.25, 2100 bgm_volume => 0.25,
2064 face_prefetch => 0, 2101 face_prefetch => 0,
2065 output_sync => 1, 2102 output_sync => 1,
… …
2073 while (my ($k, $v) = each %DEF_CFG) { 2110 while (my ($k, $v) = each %DEF_CFG) {
2074 $CFG->{$k} = $v unless exists $CFG->{$k}; 2111 $CFG->{$k} = $v unless exists $CFG->{$k};
2075 } 2112 }
2076 2113
2077 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2114 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2115 $PROFILE = $CFG->{profile}{default};
2116
2117 # convert old bindings (only default profile matters)
2118 if (my $bindings = delete $PROFILE->{bindings}) {
2119 while (my ($mod, $syms) = each %$bindings) {
2120 while (my ($sym, $cmds) = each %$syms) {
2121 push @{ $PROFILE->{macro} }, {
2122 accelkey => [$mod*1, $sym*1],
2123 action => $cmds,
2124 };
2125 }
2126 }
2127 }
2078 2128
2079 sdl_init; 2129 sdl_init;
2080 2130
2081 @SDL_MODES = reverse 2131 @SDL_MODES = reverse
2082 grep $_->[0] >= 640 && $_->[1] >= 480, 2132 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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