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.142 by root, Mon Mar 12 22:23:09 2007 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 = 1;
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};
145} 179}
146 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
147# server query dialog 184# server query dialog
148sub server_query { 185sub server_query {
149 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 }
150 202
151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
152 x => "center", 204 x => "center",
153 y => "center", 205 y => "center",
154 title => "Server Query", 206 title => "Server Query",
… …
343 status "logging in..."; 395 status "logging in...";
344 396
345 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
346 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
347 399
348 $PROFILE = $CFG->{profile}{default};
349
350 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;
351 401
352 my ($host, $port) = split /:/, $PROFILE->{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
353 403
354 $MAP = new CFPlus::Map $mapsize, $mapsize; 404 $MAP = new CFPlus::Map;
355 405
356 $CONN = eval { 406 $CONN = eval {
357 new CFPlus::Protocol 407 new CFPlus::Protocol
358 host => $host, 408 host => $host,
359 port => $port || 13327, 409 port => $port || 13327,
… …
397sub stop_game { 447sub stop_game {
398 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
400 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
401 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
402 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
403 453
404 return unless $CONN; 454 return unless $CONN;
405 455
406 status "connection closed"; 456 status "connection closed";
407 457
… …
634 $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 });
635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 685 $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 }); 686 $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"); 687 $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 }); 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" } );
639 690
640 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);
641 692
642 for my $x (0..2) { 693 for my $x (0..2) {
643 for my $y (0 .. 2) { 694 for my $y (0 .. 2) {
… …
647 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 },
648 ); 699 );
649 } 700 }
650 } 701 }
651 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
652 704
653 $table 705 $table
654} 706}
655 707
656sub stats_window { 708sub stats_window {
… …
825 877
826 my $table = $METASERVER->{table}; 878 my $table = $METASERVER->{table};
827 $table->clear; 879 $table->clear;
828 $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...");
829 881
830 my $buf; 882 my $ok = 0;
831 883
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 884 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent;
833 886
834 unless ($fh) { 887 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 888 } sub {
836 return; 889 my ($msg) = @_;
837 } 890 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; 891 $table->clear;
852 892
853 my @tip = ( 893 my @tip = (
854 "The current number of users logged in on the server.", 894 "The current number of users logged in on the server.",
855 "The hostname of the server.", 895 "The hostname of the server.",
… …
865 for 0 .. $#col; 905 for 0 .. $#col;
866 906
867 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
868 908
869 my $y = 0; 909 my $y = 0;
870 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 910 for my $m (@{ $msg->{servers} }) {
871 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 911 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
912 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
872 913
873 for ($desc) { 914 for ($desc) {
874 s/<br>/\n/gi; 915 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 916 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 917 s/<.*?>//sgi;
877 s/&/&amp;/g; 918 s/&amp;/&/g;
878 s/</&lt;/g; 919 s/&lt;/</g;
879 s/>/&gt;/g; 920 s/&gt;/>/g;
880 } 921 }
881 922
882 $uptime = sprintf "%dd %02d:%02d:%02d", 923 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 924 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 925 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 926 (int $uptime / 60) % 60,
886 $m->[8] % 60; 927 $uptime % 60;
887 928
888 $m = [$users, $host, $uptime, $version, $desc]; 929 $m = [$users, $host, $uptime, $version, $desc];
889 930
890 $y++; 931 $y++;
891 932
… …
901 ), 942 ),
902 (new CFPlus::UI::Empty expand => 1), 943 (new CFPlus::UI::Empty expand => 1),
903 ]); 944 ]);
904 945
905 $table->add ($_, $y, new CFPlus::UI::Label 946 $table->add ($_, $y, new CFPlus::UI::Label
947 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 948 ellipsise => 0,
907 align => $align[$_], 949 align => $align[$_],
908 text => $m->[$_], 950 text => $m->[$_],
909 tooltip => $tip[$_], 951 tooltip => $tip[$_],
952 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 953 can_hover => 1,
911 can_events => 1, 954 can_events => 1,
912 fontsize => 0.8) 955 fontsize => 0.8)
913 for 0 .. $#$m; 956 for 0 .. $#$m;
914 } 957 }
958 } else {
959 $ok or $label->set_text ("error while contacting metaserver");
915 } 960 }
916 }); 961 };
962
917} 963}
918 964
919sub metaserver_dialog { 965sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 966 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 967 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 971 title => "Server List",
926 name => 'metaserver_dialog', 972 name => 'metaserver_dialog',
927 x => 'center', 973 x => 'center',
928 y => 'center', 974 y => 'center',
929 z => 3, 975 z => 3,
976 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 977 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 978 child => $vbox,
932 has_close_button => 1, 979 has_close_button => 1,
933 table => $table, 980 table => $table,
934 on_visibility_change => sub { 981 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 982 update_metaserver ($_[0]) if $_[1];
… …
1156 ["Boots" => PICKUP_BOOTS], 1203 ["Boots" => PICKUP_BOOTS],
1157 ["Gloves" => PICKUP_GLOVES], 1204 ["Gloves" => PICKUP_GLOVES],
1158 ["Cloaks" => PICKUP_CLOAK], 1205 ["Cloaks" => PICKUP_CLOAK],
1159 ], 1206 ],
1160 1207
1161 ["Readables", 2, 2, 1208 ["Readables", 2, 0,
1162 ["Spellbooks" => PICKUP_SPELLBOOK], 1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1163 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1164 ["Normal Books/Scrolls" => PICKUP_READABLES], 1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1165 ], 1212 ],
1166 ["Misc", 2, 7, 1213 ["Misc", 2, 5,
1167 ["Food" => PICKUP_FOOD], 1214 ["Food" => PICKUP_FOOD],
1168 ["Drinks" => PICKUP_DRINK], 1215 ["Drinks" => PICKUP_DRINK],
1169 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1170 ["Keys" => PICKUP_KEY], 1217 ["Keys" => PICKUP_KEY],
1171 ["Magical Items" => PICKUP_MAGICAL], 1218 ["Magical Items" => PICKUP_MAGICAL],
1172 ["Potions" => PICKUP_POTION], 1219 ["Potions" => PICKUP_POTION],
1173 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1174 ["Ignore cursed" => PICKUP_NOT_CURSED], 1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1175 ["Jewelery" => PICKUP_JEWELS], 1222 ["Jewelery" => PICKUP_JEWELS],
1223 ["Flesh" => PICKUP_FLESH],
1176 ], 1224 ],
1177 ["Weight/Value ratio", 2, 17] 1225 ["Weight/Value ratio", 2, 17]
1178 ) 1226 )
1179 { 1227 {
1180 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
… …
1230 $table 1278 $table
1231} 1279}
1232 1280
1233my %SORT_ORDER = ( 1281my %SORT_ORDER = (
1234 type => undef, 1282 type => undef,
1235 mtime => sub { sort { 1283 mtime => sub {
1284 my $NOW = time;
1285 sort {
1286 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1287 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1288
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1289 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1290 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1291 or $a->{type} <=> $b->{type}
1292 } @_
1239 } @_ }, 1293 },
1240 weight => sub { sort { 1294 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1295 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1296 or $a->{type} <=> $b->{type}
1243 } @_ }, 1297 } @_ },
1244); 1298);
… …
1269 #TODO# update to weigh/maxweight 1323 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1324 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1325
1272 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory); 1327 $sw1->add ($INV = new CFPlus::UI::Inventory);
1328 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1274 1329
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1330 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1331
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1332 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1333
… …
1318 $ntb->add ( 1373 $ntb->add (
1319 "Skills (F3)" => $SKILL_PAGE = skill_window, 1374 "Skills (F3)" => $SKILL_PAGE = skill_window,
1320 "Shows all your Skills." 1375 "Shows all your Skills."
1321 ); 1376 );
1322 1377
1323 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1378 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1379 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1325 $ntb->add ( 1380 $ntb->add (
1326 "Spellbook (F4)" => $spellsw, 1381 "Spellbook (F4)" => $spellsw,
1327 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1382 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1328 ); 1383 );
1329 $ntb->add ( 1384 $ntb->add (
… …
1336 1391
1337 $plwin->add ($ntb); 1392 $plwin->add ($ntb);
1338 $plwin 1393 $plwin
1339} 1394}
1340 1395
1341sub update_bindings {
1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1343}
1344
1345sub keyboard_setup { 1396sub keyboard_setup {
1346 my $binding_list = new CFPlus::UI::VBox; 1397 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} 1398}
1459 1399
1460sub help_window { 1400sub help_window {
1461 my $win = new CFPlus::UI::Toplevel 1401 my $win = new CFPlus::UI::Toplevel
1462 x => 'center', 1402 x => 'center',
… …
1647 1587
1648 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1588 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1649 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1589 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]); 1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1651 1591
1652 $vbox->add (my $table = new CFPlus::UI::Table); 1592 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1653 1593
1654 $table->add (0, 0, new CFPlus::UI::Button 1594 $table->add (0, 0, new CFPlus::UI::Button
1655 text => "Close", 1595 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>.", 1596 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, 1597 on_activate => $close,
1658 ); 1598 );
1659 1599
1660 $table->add (2, 0, new CFPlus::UI::Button 1600 $table->add (2, 0, new CFPlus::UI::Button
1661 text => "Next", 1601 text => "Next",
1662 tooltip => "Show the next <b>Tip of the day</b>.", 1602 tooltip => "Show the next <b>Tip of the day</b>.",
1663 on_activate => sub { 1603 on_activate => sub {
1664 $close->(); 1604 $close->();
1665 &show_tip_of_the_day; 1605 &show_tip_of_the_day;
1666 }, 1606 },
… …
1708 padding => 0, 1648 padding => 0,
1709 z => 100, 1649 z => 100,
1710 force_x => "max", 1650 force_x => "max",
1711 force_y => 0; 1651 force_y => 0;
1712 $DEBUG_STATUS->show; 1652 $DEBUG_STATUS->show;
1713
1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1715 1653
1716 $STATUSBOX = new CFPlus::UI::Statusbox; 1654 $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]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1718 1656
1719 (new CFPlus::UI::Frame 1657 (new CFPlus::UI::Frame
… …
1820 ); 1758 );
1821 1759
1822 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1823 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1824 1762
1763
1825 $BUTTONBAR->add (new CFPlus::UI::Button 1764 $BUTTONBAR->add (new CFPlus::UI::Button
1826 text => "Quit", 1765 text => "Quit",
1827 tooltip => "Terminates the program", 1766 tooltip => "Terminates the program",
1828 on_activate => sub { 1767 on_activate => sub {
1829 if ($CONN) { 1768 if ($CONN) {
… …
1840 } 1779 }
1841 1780
1842 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1781 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1843} 1782}
1844 1783
1784sub setup_build_button {
1785 my ($enabled) = @_;
1786 if ($enabled) {
1787 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1788 $BUILD_BUTTON ||= new CFPlus::UI::Button
1789 text => "Build",
1790 tooltip => "Opens the ingame builder",
1791 on_activate => sub {
1792 if ($CONN) {
1793 $CONN->send_ext_req (builder_player_items => sub {
1794 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1795 });
1796 }
1797 0
1798 };
1799 $BUTTONBAR->add ($BUILD_BUTTON);
1800 } else {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 }
1803}
1804
1805sub open_ingame_editor {
1806 my ($msg) = @_;
1807
1808 my $win = new CFPlus::UI::Toplevel
1809 x => 0,
1810 y => 'center',
1811 z => 4,
1812 name => 'builder_window',
1813 force_w => int $WIDTH * 1/4,
1814 force_h => int $HEIGHT * 3/4,
1815 title => "In game builder",
1816 has_close_button => 1;
1817
1818 my $r = new CFPlus::UI::ScrolledWindow (
1819 expand => 1,
1820 scroll_y => 1
1821 );
1822 $r->add (my $vb = new CFPlus::UI::VBox);
1823 $win->add ($r);
1824
1825
1826 $vb->add (
1827 new CFPlus::UI::Button
1828 text => "Disable build mode",
1829 on_activate => sub { $::IN_BUILD_MODE = undef }
1830 );
1831 $vb->add (
1832 new CFPlus::UI::Button
1833 text => "ERASE",
1834 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1835 );
1836
1837 for my $itemarchname (
1838 sort {
1839 $msg->{items}->{$a}->{build_arch_name}
1840 cmp $msg->{items}->{$b}->{build_arch_name}
1841 } keys %{$msg->{items}}
1842 ) {
1843 my $info = $msg->{items}->{$itemarchname};
1844 $vb->add (
1845 new CFPlus::UI::Button text => $info->{build_arch_name},
1846 on_activate => sub {
1847 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1848
1849 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1850 build_mode_query_arch_info ();
1851 }
1852 }
1853 );
1854 }
1855
1856 $win->show;
1857}
1858
1859sub build_mode_query_arch_info {
1860 my ($iteminfo) = $::IN_BUILD_MODE;
1861 my $itemarchname = $iteminfo->{item};
1862 my $info = $iteminfo->{info};
1863
1864 my $dialog = new CFPlus::UI::Toplevel
1865 x => "center",
1866 y => "center",
1867 z => 50,
1868 force_w => int $WIDTH * 1/2,
1869 title => "Enter information for placement of '$itemarchname'",
1870 has_close_button => 1;
1871
1872 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1873
1874 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1875 my $row = 0;
1876 if ($info->{has_name}) {
1877 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1878 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1879 }
1880 if ($info->{has_text}) {
1881 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1882 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1883 }
1884 if ($info->{has_connection}) {
1885 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1886 $table->add (1, $row++,
1887 new CFPlus::UI::Entry
1888 expand => 1,
1889 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1890 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1891 );
1892 }
1893
1894 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1895 $hb->add (new CFPlus::UI::Button
1896 text => "Close",
1897 expand => 1,
1898 on_activate => sub { $dialog->hide; 0 },
1899 );
1900 $dialog->show;
1901}
1902
1845sub video_shutdown { 1903sub video_shutdown {
1846 CFPlus::OpenGL::shutdown; 1904 CFPlus::OpenGL::shutdown;
1847 1905
1848 undef $SDL_ACTIVE; 1906 undef $SDL_ACTIVE;
1849} 1907}
… …
1880 CFPlus::Mix_AllocateChannels 8; 1938 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1939 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 1940
1883 audio_music_finished; 1941 audio_music_finished;
1884 1942
1943 local $_;
1885 while (<$fh>) { 1944 while (<$fh>) {
1886 next if /^\s*#/; 1945 next if /^\s*#/;
1887 next if /^\s*$/; 1946 next if /^\s*$/;
1888 1947
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 1948 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1974 }, 2033 },
1975 CFPlus::SDL_VIDEOEXPOSE => sub { 2034 CFPlus::SDL_VIDEOEXPOSE => sub {
1976 CFPlus::UI::full_refresh; 2035 CFPlus::UI::full_refresh;
1977 }, 2036 },
1978 CFPlus::SDL_ACTIVEEVENT => sub { 2037 CFPlus::SDL_ACTIVEEVENT => sub {
1979# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2038# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1980 }, 2043 },
1981 CFPlus::SDL_KEYDOWN => sub { 2044 CFPlus::SDL_KEYDOWN => sub {
1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2045 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1983 # alt-enter 2046 # alt-enter
1984 $FULLSCREEN_ENABLE->toggle; 2047 $FULLSCREEN_ENABLE->toggle;
… …
2023 log_fontsize => 0.7, 2086 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2087 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2088 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2089 stat_fontsize => 0.7,
2027 mapsize => 100, 2090 mapsize => 100,
2028 say_command => 'say', 2091 say_command => 'chat',
2029 audio_enable => 1, 2092 audio_enable => 1,
2030 bgm_enable => 1, 2093 bgm_enable => 1,
2031 bgm_volume => 0.25, 2094 bgm_volume => 0.25,
2032 face_prefetch => 0, 2095 face_prefetch => 0,
2033 output_sync => 1, 2096 output_sync => 1,
… …
2041 while (my ($k, $v) = each %DEF_CFG) { 2104 while (my ($k, $v) = each %DEF_CFG) {
2042 $CFG->{$k} = $v unless exists $CFG->{$k}; 2105 $CFG->{$k} = $v unless exists $CFG->{$k};
2043 } 2106 }
2044 2107
2045 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2108 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2109 $PROFILE = $CFG->{profile}{default};
2110
2111 # convert old bindings (only default profile matters)
2112 if (my $bindings = delete $PROFILE->{bindings}) {
2113 while (my ($mod, $syms) = each %$bindings) {
2114 while (my ($sym, $cmds) = each %$syms) {
2115 push @{ $PROFILE->{macro} }, {
2116 accelkey => [$mod*1, $sym*1],
2117 action => $cmds,
2118 };
2119 }
2120 }
2121 }
2046 2122
2047 sdl_init; 2123 sdl_init;
2048 2124
2049 @SDL_MODES = reverse 2125 @SDL_MODES = reverse
2050 grep $_->[0] >= 640 && $_->[1] >= 480, 2126 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2087# } 2163# }
2088# my $t2 = Time::HiRes::time; 2164# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2165# warn $t2-$t1;
2090# } 2166# }
2091 2167
2168 $startup_done->();
2169
2092 video_init; 2170 video_init;
2093 audio_init; 2171 audio_init;
2094} 2172}
2095 2173
2096show_tip_of_the_day if $CFG->{show_tips}; 2174show_tip_of_the_day if $CFG->{show_tips};

Diff Legend

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