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.120 by root, Sun Oct 1 14:48:51 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
56our $VERSION = '0.9';
57 77
58my $MAX_FPS = 60; 78my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
60 80
61our $META_SERVER = "crossfire.real-time.com:13326"; 81our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62 82
63our $LAST_REFRESH; 83our $LAST_REFRESH;
64our $NOW; 84our $NOW;
65 85
66our $CFG; 86our $CFG;
… …
104 124
105our $INVENTORY_PAGE; 125our $INVENTORY_PAGE;
106our $STATS_PAGE; 126our $STATS_PAGE;
107our $SKILL_PAGE; 127our $SKILL_PAGE;
108our $SPELL_PAGE; 128our $SPELL_PAGE;
129our $SPELL_LIST;
109 130
110our $HELP_WINDOW; 131our $HELP_WINDOW;
111our $MESSAGE_WINDOW; 132our $MESSAGE_WINDOW;
112our $FLOORBOX; 133our $FLOORBOX;
113our $GAUGES; 134our $GAUGES;
… …
126 147
127our $INV; 148our $INV;
128our $INVR; 149our $INVR;
129our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
130 151
131our $BIND_EDITOR;
132our $BIND_UPD_CB;
133
134our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
135 156
136sub status { 157sub status {
137 $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]);
138} 159}
139 160
140sub debug { 161sub debug {
141 $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;
142} 174}
143 175
144sub destroy_query_dialog { 176sub destroy_query_dialog {
145 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
146 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
… …
345 status "logging in..."; 377 status "logging in...";
346 378
347 $LOGIN_BUTTON->set_text ("Logout"); 379 $LOGIN_BUTTON->set_text ("Logout");
348 $SETUP_DIALOG->hide; 380 $SETUP_DIALOG->hide;
349 381
350 $PROFILE = $CFG->{profile}{default};
351
352 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;
353 383
354 my ($host, $port) = split /:/, $PROFILE->{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
355 385
356 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
357 387
358 $CONN = eval { 388 $CONN = eval {
359 new CFPlus::Protocol 389 new CFPlus::Protocol
360 host => $host, 390 host => $host,
361 port => $port || 13327, 391 port => $port || 13327,
362 user => $PROFILE->{user}, 392 user => $PROFILE->{user},
363 pass => $PROFILE->{password}, 393 pass => $PROFILE->{password},
364 mapw => $mapsize, 394 mapw => $mapsize,
365 maph => $mapsize, 395 maph => $mapsize,
366 396
367 client => "cfplus $VERSION $] $^O", 397 client => "cfplus $CFPlus::VERSION $] $^O",
368 398
369 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
370 logview => $LOGVIEW, 400 logview => $LOGVIEW,
371 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
372 map => $MAP, 402 map => $MAP,
… …
399sub stop_game { 429sub stop_game {
400 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
401 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
402 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
403 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
404 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
405 435
406 return unless $CONN; 436 return unless $CONN;
407 437
408 status "connection closed"; 438 status "connection closed";
409 439
410 destroy_query_dialog $CONN; 440 destroy_query_dialog $CONN;
411 $CONN->destroy; 441 $CONN->destroy;
412 $CONN = 0; # false, does not autovivify 442 $CONN = 0; # false, does not autovivify
413 443
414 undef $MAP; 444 undef $MAP;
415 undef $PROFILE;
416} 445}
417 446
418sub graphics_setup { 447sub graphics_setup {
419 my $vbox = new CFPlus::UI::VBox; 448 my $vbox = new CFPlus::UI::VBox;
420 449
… …
637 $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 });
638 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
639 $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 });
640 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
641 $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" } );
642 672
643 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);
644 674
645 for my $x (0..2) { 675 for my $x (0..2) {
646 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
650 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 },
651 ); 681 );
652 } 682 }
653 } 683 }
654 684
685 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
655 686
656 $table 687 $table
657} 688}
658 689
659sub stats_window { 690sub stats_window {
… …
828 859
829 my $table = $METASERVER->{table}; 860 my $table = $METASERVER->{table};
830 $table->clear; 861 $table->clear;
831 $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...");
832 863
833 my $buf; 864 my $ok = 0;
834 865
835 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 866 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent;
836 868
837 unless ($fh) { 869 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
838 $label->set_text ("unable to contact metaserver: $!"); 870 } sub {
839 return; 871 my ($msg) = @_;
840 } 872 if ($msg) {
841
842 Event->io (fd => $fh, poll => 'r', cb => sub {
843 my $res = sysread $fh, $buf, 8192, length $buf;
844
845 if (!defined $res) {
846 $_[0]->w->cancel;
847 $label->set_text ("error while retrieving server list: $!");
848 } elsif ($res == 0) {
849 $_[0]->w->cancel;
850 status "server list retrieved";
851
852 utf8::decode $buf if utf8::valid $buf;
853
854 $table->clear; 873 $table->clear;
855 874
856 my @tip = ( 875 my @tip = (
857 "The current number of users logged in on the server.", 876 "The current number of users logged in on the server.",
858 "The hostname of the server.", 877 "The hostname of the server.",
… …
868 for 0 .. $#col; 887 for 0 .. $#col;
869 888
870 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
871 890
872 my $y = 0; 891 my $y = 0;
873 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 ) {
874 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)};
875 901
876 for ($desc) { 902 for ($desc) {
877 s/<br>/\n/gi; 903 s/<br>/\n/gi;
878 s/<li>/\n· /gi; 904 s/<li>/\n· /gi;
879 s/<.*?>//sgi; 905 s/<.*?>//sgi;
880 s/&/&amp;/g; 906 s/&amp;/&/g;
881 s/</&lt;/g; 907 s/&lt;/</g;
882 s/>/&gt;/g; 908 s/&gt;/>/g;
883 } 909 }
884 910
885 $uptime = sprintf "%dd %02d:%02d:%02d", 911 $uptime = sprintf "%dd %02d:%02d:%02d",
886 (int $m->[8] / 86400), 912 (int $uptime / 86400),
887 (int $m->[8] / 3600) % 24, 913 (int $uptime / 3600) % 24,
888 (int $m->[8] / 60) % 60, 914 (int $uptime / 60) % 60,
889 $m->[8] % 60; 915 $uptime % 60;
890 916
891 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
892 918
893 $y++; 919 $y++;
894 920
… …
904 ), 930 ),
905 (new CFPlus::UI::Empty expand => 1), 931 (new CFPlus::UI::Empty expand => 1),
906 ]); 932 ]);
907 933
908 $table->add ($_, $y, new CFPlus::UI::Label 934 $table->add ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4,
909 ellipsise => 0, 936 ellipsise => 0,
910 align => $align[$_], 937 align => $align[$_],
911 text => $m->[$_], 938 text => $m->[$_],
912 tooltip => $tip[$_], 939 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
913 can_hover => 1, 941 can_hover => 1,
914 can_events => 1, 942 can_events => 1,
915 fontsize => 0.8) 943 fontsize => 0.8)
916 for 0 .. $#$m; 944 for 0 .. $#$m;
917 } 945 }
946 } else {
947 $ok or $label->set_text ("error while contacting metaserver");
918 } 948 }
919 }); 949 };
950
920} 951}
921 952
922sub metaserver_dialog { 953sub metaserver_dialog {
923 my $vbox = new CFPlus::UI::VBox; 954 my $vbox = new CFPlus::UI::VBox;
924 my $table = new CFPlus::UI::Table; 955 my $table = new CFPlus::UI::Table;
… …
928 title => "Server List", 959 title => "Server List",
929 name => 'metaserver_dialog', 960 name => 'metaserver_dialog',
930 x => 'center', 961 x => 'center',
931 y => 'center', 962 y => 'center',
932 z => 3, 963 z => 3,
964 force_w => $::WIDTH * 0.9,
933 force_h => $::HEIGHT * 0.4, 965 force_h => $::HEIGHT * 0.7,
934 child => $vbox, 966 child => $vbox,
935 has_close_button => 1, 967 has_close_button => 1,
936 table => $table, 968 table => $table,
937 on_visibility_change => sub { 969 on_visibility_change => sub {
938 update_metaserver ($_[0]) if $_[1]; 970 update_metaserver ($_[0]) if $_[1];
… …
1058 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1059 state => $CFG->{show_tips}, 1091 state => $CFG->{show_tips},
1060 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1092 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1061 on_changed => sub { 1093 on_changed => sub {
1062 my ($self, $value) = @_; 1094 my ($self, $value) = @_;
1063 $CFG->{shop_tips} = $value; 1095 $CFG->{show_tips} = $value;
1064 0 1096 0
1065 } 1097 }
1066 ); 1098 );
1067 1099
1068 $vbox->add (new CFPlus::UI::FancyFrame 1100 $vbox->add (new CFPlus::UI::FancyFrame
… …
1159 ["Boots" => PICKUP_BOOTS], 1191 ["Boots" => PICKUP_BOOTS],
1160 ["Gloves" => PICKUP_GLOVES], 1192 ["Gloves" => PICKUP_GLOVES],
1161 ["Cloaks" => PICKUP_CLOAK], 1193 ["Cloaks" => PICKUP_CLOAK],
1162 ], 1194 ],
1163 1195
1164 ["Readables", 2, 2, 1196 ["Readables", 2, 0,
1165 ["Spellbooks" => PICKUP_SPELLBOOK], 1197 ["Spellbooks" => PICKUP_SPELLBOOK],
1166 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1198 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1167 ["Normal Books/Scrolls" => PICKUP_READABLES], 1199 ["Normal Books/Scrolls" => PICKUP_READABLES],
1168 ], 1200 ],
1169 ["Misc", 2, 7, 1201 ["Misc", 2, 5,
1170 ["Food" => PICKUP_FOOD], 1202 ["Food" => PICKUP_FOOD],
1171 ["Drinks" => PICKUP_DRINK], 1203 ["Drinks" => PICKUP_DRINK],
1172 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1204 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1173 ["Keys" => PICKUP_KEY], 1205 ["Keys" => PICKUP_KEY],
1174 ["Magical Items" => PICKUP_MAGICAL], 1206 ["Magical Items" => PICKUP_MAGICAL],
1175 ["Potions" => PICKUP_POTION], 1207 ["Potions" => PICKUP_POTION],
1176 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1208 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1177 ["Ignore cursed" => PICKUP_NOT_CURSED], 1209 ["Ignore cursed" => PICKUP_NOT_CURSED],
1178 ["Jewelery" => PICKUP_JEWELS], 1210 ["Jewelery" => PICKUP_JEWELS],
1211 ["Flesh" => PICKUP_FLESH],
1179 ], 1212 ],
1180 ["Weight/Value ratio", 2, 17] 1213 ["Weight/Value ratio", 2, 17]
1181 ) 1214 )
1182 { 1215 {
1183 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
… …
1233 $table 1266 $table
1234} 1267}
1235 1268
1236my %SORT_ORDER = ( 1269my %SORT_ORDER = (
1237 type => undef, 1270 type => undef,
1238 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
1239 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1277 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1240 or $b->{mtime} <=> $a->{mtime} 1278 or $btime <=> $atime
1241 or $a->{type} <=> $b->{type} 1279 or $a->{type} <=> $b->{type}
1280 } @_
1242 } @_ }, 1281 },
1243 weight => sub { sort { 1282 weight => sub { sort {
1244 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1283 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1245 or $a->{type} <=> $b->{type} 1284 or $a->{type} <=> $b->{type}
1246 } @_ }, 1285 } @_ },
1247); 1286);
… …
1272 #TODO# update to weigh/maxweight 1311 #TODO# update to weigh/maxweight
1273 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1312 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1274 1313
1275 $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);
1276 $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}});
1277 1317
1278 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1318 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1279 1319
1280 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1320 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1281 1321
… …
1321 $ntb->add ( 1361 $ntb->add (
1322 "Skills (F3)" => $SKILL_PAGE = skill_window, 1362 "Skills (F3)" => $SKILL_PAGE = skill_window,
1323 "Shows all your Skills." 1363 "Shows all your Skills."
1324 ); 1364 );
1325 1365
1326 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);
1327 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1328 $ntb->add ( 1368 $ntb->add (
1329 "Spellbook (F4)" => $spellsw, 1369 "Spellbook (F4)" => $spellsw,
1330 "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."
1331 ); 1371 );
1332 $ntb->add ( 1372 $ntb->add (
… …
1339 1379
1340 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1341 $plwin 1381 $plwin
1342} 1382}
1343 1383
1344sub update_bindings {
1345 $BIND_UPD_CB->() if $BIND_UPD_CB;
1346}
1347
1348sub keyboard_setup { 1384sub keyboard_setup {
1349 my $binding_list = new CFPlus::UI::VBox; 1385 CFPlus::Macro::keyboard_setup
1350
1351 my $refresh;
1352 $refresh = $BIND_UPD_CB = sub {
1353 $binding_list->clear ();
1354
1355 return unless $PROFILE;
1356
1357 for my $mod (keys %{$PROFILE->{bindings}}) {
1358 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1359 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1360 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1361
1362 my $lbl = join "; ", @$cmds;
1363 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1364 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1365 $hb->add (new CFPlus::UI::Button
1366 text => "delete",
1367 tooltip => "Deletes the binding",
1368 on_activate => sub {
1369 $binding_list->remove ($hb);
1370 delete $PROFILE->{bindings}{$mod}{$sym};
1371 0
1372 });
1373
1374 $hb->add (new CFPlus::UI::Button
1375 text => "edit",
1376 tooltip => "Edits the binding",
1377 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (
1379 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1380 sub {
1381 my ($nmod, $nsym, $ncmds) = @_;
1382 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1383 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1384 $refresh->();
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1387 },
1388 sub {
1389 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1390 $SETUP_DIALOG->show;
1391 });
1392 $::BIND_EDITOR->show;
1393 $SETUP_DIALOG->hide;
1394 0
1395 });
1396
1397 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1398 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1399 }
1400 }
1401 };
1402
1403 my $vb = new CFPlus::UI::VBox;
1404 $vb->add (new CFPlus::UI::FancyFrame
1405 label => "Options",
1406 child => (my $hb = new CFPlus::UI::HBox),
1407 );
1408 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1409 $hb->add (new CFPlus::UI::CheckBox
1410 expand => 1,
1411 state => $CFG->{shift_fire_stop},
1412 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1413 on_changed => sub {
1414 my ($cbox, $value) = @_;
1415 $CFG->{shift_fire_stop} = $value;
1416 0
1417 });
1418
1419 $vb->add (new CFPlus::UI::FancyFrame
1420 label => "Bindings",
1421 child => $binding_list);
1422 $vb->add (my $hb = new CFPlus::UI::HBox);
1423
1424 $hb->add (new CFPlus::UI::Button
1425 text => "record new",
1426 expand => 1,
1427 tooltip => "This button opens the binding editor with an empty binding.",
1428 on_activate => sub {
1429 $::BIND_EDITOR->set_binding (undef, undef, [],
1430 sub {
1431 my ($mod, $sym, $cmds) = @_;
1432 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1433 $refresh->();
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 },
1437 sub {
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 },
1441 );
1442 $SETUP_DIALOG->hide;
1443 $::BIND_EDITOR->show;
1444 0
1445 },
1446 );
1447
1448 $hb->add (new CFPlus::UI::Button
1449 text => "close",
1450 tooltip => "Closes the binding window",
1451 expand => 1,
1452 on_activate => sub {
1453 $SETUP_DIALOG->hide;
1454 0
1455 }
1456 );
1457
1458 $refresh->();
1459
1460 $vb
1461} 1386}
1462 1387
1463sub help_window { 1388sub help_window {
1464 my $win = new CFPlus::UI::Toplevel 1389 my $win = new CFPlus::UI::Toplevel
1465 x => 'center', 1390 x => 'center',
… …
1650 1575
1651 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1652 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1653 $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]);
1654 1579
1655 $vbox->add (my $table = new CFPlus::UI::Table); 1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1656 1581
1657 $table->add (0, 0, new CFPlus::UI::Button 1582 $table->add (0, 0, new CFPlus::UI::Button
1658 text => "Close", 1583 text => "Close",
1659 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>.",
1660 on_activate => $close, 1585 on_activate => $close,
1661 ); 1586 );
1662 1587
1663 $table->add (2, 0, new CFPlus::UI::Button 1588 $table->add (2, 0, new CFPlus::UI::Button
1664 text => "Next", 1589 text => "Next",
1665 tooltip => "Show the next <b>Tip of the day</b>.", 1590 tooltip => "Show the next <b>Tip of the day</b>.",
1666 on_activate => sub { 1591 on_activate => sub {
1667 $close->(); 1592 $close->();
1668 &show_tip_of_the_day; 1593 &show_tip_of_the_day;
1669 }, 1594 },
… …
1711 padding => 0, 1636 padding => 0,
1712 z => 100, 1637 z => 100,
1713 force_x => "max", 1638 force_x => "max",
1714 force_y => 0; 1639 force_y => 0;
1715 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1716
1717 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1718 1641
1719 $STATUSBOX = new CFPlus::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1720 $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]);
1721 1644
1722 (new CFPlus::UI::Frame 1645 (new CFPlus::UI::Frame
… …
1823 ); 1746 );
1824 1747
1825 $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,
1826 tooltip => "View Documentation"); 1749 tooltip => "View Documentation");
1827 1750
1751
1828 $BUTTONBAR->add (new CFPlus::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1829 text => "Quit", 1753 text => "Quit",
1830 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1831 on_activate => sub { 1755 on_activate => sub {
1832 if ($CONN) { 1756 if ($CONN) {
… …
1843 } 1767 }
1844 1768
1845 $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]);
1846} 1770}
1847 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
1848sub video_shutdown { 1890sub video_shutdown {
1849 CFPlus::OpenGL::shutdown; 1891 CFPlus::OpenGL::shutdown;
1850 1892
1851 undef $SDL_ACTIVE; 1893 undef $SDL_ACTIVE;
1852} 1894}
… …
1883 CFPlus::Mix_AllocateChannels 8; 1925 CFPlus::Mix_AllocateChannels 8;
1884 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1926 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1885 1927
1886 audio_music_finished; 1928 audio_music_finished;
1887 1929
1930 local $_;
1888 while (<$fh>) { 1931 while (<$fh>) {
1889 next if /^\s*#/; 1932 next if /^\s*#/;
1890 next if /^\s*$/; 1933 next if /^\s*$/;
1891 1934
1892 my ($file, $volume, $event) = split /\s+/, $_, 3; 1935 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1977 }, 2020 },
1978 CFPlus::SDL_VIDEOEXPOSE => sub { 2021 CFPlus::SDL_VIDEOEXPOSE => sub {
1979 CFPlus::UI::full_refresh; 2022 CFPlus::UI::full_refresh;
1980 }, 2023 },
1981 CFPlus::SDL_ACTIVEEVENT => sub { 2024 CFPlus::SDL_ACTIVEEVENT => sub {
1982# 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;
1983 }, 2030 },
1984 CFPlus::SDL_KEYDOWN => sub { 2031 CFPlus::SDL_KEYDOWN => sub {
1985 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2032 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1986 # alt-enter 2033 # alt-enter
1987 $FULLSCREEN_ENABLE->toggle; 2034 $FULLSCREEN_ENABLE->toggle;
… …
2026 log_fontsize => 0.7, 2073 log_fontsize => 0.7,
2027 gauge_fontsize => 1, 2074 gauge_fontsize => 1,
2028 gauge_size => 0.35, 2075 gauge_size => 0.35,
2029 stat_fontsize => 0.7, 2076 stat_fontsize => 0.7,
2030 mapsize => 100, 2077 mapsize => 100,
2031 say_command => 'say', 2078 say_command => 'chat',
2032 audio_enable => 1, 2079 audio_enable => 1,
2033 bgm_enable => 1, 2080 bgm_enable => 1,
2034 bgm_volume => 0.25, 2081 bgm_volume => 0.25,
2035 face_prefetch => 0, 2082 face_prefetch => 0,
2036 output_sync => 1, 2083 output_sync => 1,
… …
2044 while (my ($k, $v) = each %DEF_CFG) { 2091 while (my ($k, $v) = each %DEF_CFG) {
2045 $CFG->{$k} = $v unless exists $CFG->{$k}; 2092 $CFG->{$k} = $v unless exists $CFG->{$k};
2046 } 2093 }
2047 2094
2048 $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 }
2049 2109
2050 sdl_init; 2110 sdl_init;
2051 2111
2052 @SDL_MODES = reverse 2112 @SDL_MODES = reverse
2053 grep $_->[0] >= 640 && $_->[1] >= 480, 2113 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2090# } 2150# }
2091# my $t2 = Time::HiRes::time; 2151# my $t2 = Time::HiRes::time;
2092# warn $t2-$t1; 2152# warn $t2-$t1;
2093# } 2153# }
2094 2154
2155 $startup_done->();
2156
2095 video_init; 2157 video_init;
2096 audio_init; 2158 audio_init;
2097} 2159}
2098 2160
2099show_tip_of_the_day if $CFG->{show_tips}; 2161show_tip_of_the_day if $CFG->{show_tips};
2100
2101use Data::Dumper; warn Dumper [CFPlus::win32_proxy_info()];#d#
2102 2162
2103Event::loop; 2163Event::loop;
2104#CFPlus::SDL_Quit; 2164#CFPlus::SDL_Quit;
2105#CFPlus::_exit 0; 2165#CFPlus::_exit 0;
2106 2166

Diff Legend

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