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.141 by elmex, Sat Dec 16 17:33:26 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 = 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
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};
147} 179}
148 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
149# server query dialog 184# server query dialog
150sub server_query { 185sub server_query {
151 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 }
152 202
153 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
154 x => "center", 204 x => "center",
155 y => "center", 205 y => "center",
156 title => "Server Query", 206 title => "Server Query",
… …
345 status "logging in..."; 395 status "logging in...";
346 396
347 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
348 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
349 399
350 $PROFILE = $CFG->{profile}{default};
351
352 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;
353 401
354 my ($host, $port) = split /:/, $PROFILE->{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
355 403
356 $MAP = new CFPlus::Map $mapsize, $mapsize; 404 $MAP = new CFPlus::Map;
357 405
358 $CONN = eval { 406 $CONN = eval {
359 new CFPlus::Protocol 407 new CFPlus::Protocol
360 host => $host, 408 host => $host,
361 port => $port || 13327, 409 port => $port || 13327,
362 user => $PROFILE->{user}, 410 user => $PROFILE->{user},
363 pass => $PROFILE->{password}, 411 pass => $PROFILE->{password},
364 mapw => $mapsize, 412 mapw => $mapsize,
365 maph => $mapsize, 413 maph => $mapsize,
366 414
367 client => "cfplus $VERSION $] $^O", 415 client => "cfplus $CFPlus::VERSION $] $^O",
368 416
369 map_widget => $MAPWIDGET, 417 map_widget => $MAPWIDGET,
370 logview => $LOGVIEW, 418 logview => $LOGVIEW,
371 statusbox => $STATUSBOX, 419 statusbox => $STATUSBOX,
372 map => $MAP, 420 map => $MAP,
… …
399sub stop_game { 447sub stop_game {
400 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
401 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
402 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
403 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
404 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
405 453
406 return unless $CONN; 454 return unless $CONN;
407 455
408 status "connection closed"; 456 status "connection closed";
409 457
410 destroy_query_dialog $CONN; 458 destroy_query_dialog $CONN;
411 $CONN->destroy; 459 $CONN->destroy;
412 $CONN = 0; # false, does not autovivify 460 $CONN = 0; # false, does not autovivify
413 461
414 undef $MAP; 462 undef $MAP;
415 undef $PROFILE;
416} 463}
417 464
418sub graphics_setup { 465sub graphics_setup {
419 my $vbox = new CFPlus::UI::VBox; 466 my $vbox = new CFPlus::UI::VBox;
420 467
… …
637 $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 });
638 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 685 $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 }); 686 $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"); 687 $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 }); 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" } );
642 690
643 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);
644 692
645 for my $x (0..2) { 693 for my $x (0..2) {
646 for my $y (0 .. 2) { 694 for my $y (0 .. 2) {
… …
650 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 },
651 ); 699 );
652 } 700 }
653 } 701 }
654 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
655 704
656 $table 705 $table
657} 706}
658 707
659sub stats_window { 708sub stats_window {
… …
828 877
829 my $table = $METASERVER->{table}; 878 my $table = $METASERVER->{table};
830 $table->clear; 879 $table->clear;
831 $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...");
832 881
833 my $buf; 882 my $ok = 0;
834 883
835 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 884 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent;
836 886
837 unless ($fh) { 887 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
838 $label->set_text ("unable to contact metaserver: $!"); 888 } sub {
839 return; 889 my ($msg) = @_;
840 } 890 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; 891 $table->clear;
855 892
856 my @tip = ( 893 my @tip = (
857 "The current number of users logged in on the server.", 894 "The current number of users logged in on the server.",
858 "The hostname of the server.", 895 "The hostname of the server.",
… …
868 for 0 .. $#col; 905 for 0 .. $#col;
869 906
870 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
871 908
872 my $y = 0; 909 my $y = 0;
873 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 ) {
874 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)};
875 919
876 for ($desc) { 920 for ($desc) {
877 s/<br>/\n/gi; 921 s/<br>/\n/gi;
878 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
879 s/<.*?>//sgi; 923 s/<.*?>//sgi;
880 s/&/&amp;/g; 924 s/&amp;/&/g;
881 s/</&lt;/g; 925 s/&lt;/</g;
882 s/>/&gt;/g; 926 s/&gt;/>/g;
883 } 927 }
884 928
885 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
886 (int $m->[8] / 86400), 930 (int $uptime / 86400),
887 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
888 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
889 $m->[8] % 60; 933 $uptime % 60;
890 934
891 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
892 936
893 $y++; 937 $y++;
894 938
… …
904 ), 948 ),
905 (new CFPlus::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
906 ]); 950 ]);
907 951
908 $table->add ($_, $y, new CFPlus::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4,
909 ellipsise => 0, 954 ellipsise => 0,
910 align => $align[$_], 955 align => $align[$_],
911 text => $m->[$_], 956 text => $m->[$_],
912 tooltip => $tip[$_], 957 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
913 can_hover => 1, 959 can_hover => 1,
914 can_events => 1, 960 can_events => 1,
915 fontsize => 0.8) 961 fontsize => 0.8)
916 for 0 .. $#$m; 962 for 0 .. $#$m;
917 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
918 } 966 }
919 }); 967 };
968
920} 969}
921 970
922sub metaserver_dialog { 971sub metaserver_dialog {
923 my $vbox = new CFPlus::UI::VBox; 972 my $vbox = new CFPlus::UI::VBox;
924 my $table = new CFPlus::UI::Table; 973 my $table = new CFPlus::UI::Table;
… …
928 title => "Server List", 977 title => "Server List",
929 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
930 x => 'center', 979 x => 'center',
931 y => 'center', 980 y => 'center',
932 z => 3, 981 z => 3,
982 force_w => $::WIDTH * 0.9,
933 force_h => $::HEIGHT * 0.4, 983 force_h => $::HEIGHT * 0.7,
934 child => $vbox, 984 child => $vbox,
935 has_close_button => 1, 985 has_close_button => 1,
936 table => $table, 986 table => $table,
937 on_visibility_change => sub { 987 on_visibility_change => sub {
938 update_metaserver ($_[0]) if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
… …
1058 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1108 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1059 state => $CFG->{show_tips}, 1109 state => $CFG->{show_tips},
1060 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1110 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1061 on_changed => sub { 1111 on_changed => sub {
1062 my ($self, $value) = @_; 1112 my ($self, $value) = @_;
1063 $CFG->{shop_tips} = $value; 1113 $CFG->{show_tips} = $value;
1064 0 1114 0
1065 } 1115 }
1066 ); 1116 );
1067 1117
1068 $vbox->add (new CFPlus::UI::FancyFrame 1118 $vbox->add (new CFPlus::UI::FancyFrame
… …
1159 ["Boots" => PICKUP_BOOTS], 1209 ["Boots" => PICKUP_BOOTS],
1160 ["Gloves" => PICKUP_GLOVES], 1210 ["Gloves" => PICKUP_GLOVES],
1161 ["Cloaks" => PICKUP_CLOAK], 1211 ["Cloaks" => PICKUP_CLOAK],
1162 ], 1212 ],
1163 1213
1164 ["Readables", 2, 2, 1214 ["Readables", 2, 0,
1165 ["Spellbooks" => PICKUP_SPELLBOOK], 1215 ["Spellbooks" => PICKUP_SPELLBOOK],
1166 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1216 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1167 ["Normal Books/Scrolls" => PICKUP_READABLES], 1217 ["Normal Books/Scrolls" => PICKUP_READABLES],
1168 ], 1218 ],
1169 ["Misc", 2, 7, 1219 ["Misc", 2, 5,
1170 ["Food" => PICKUP_FOOD], 1220 ["Food" => PICKUP_FOOD],
1171 ["Drinks" => PICKUP_DRINK], 1221 ["Drinks" => PICKUP_DRINK],
1172 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1222 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1173 ["Keys" => PICKUP_KEY], 1223 ["Keys" => PICKUP_KEY],
1174 ["Magical Items" => PICKUP_MAGICAL], 1224 ["Magical Items" => PICKUP_MAGICAL],
1175 ["Potions" => PICKUP_POTION], 1225 ["Potions" => PICKUP_POTION],
1176 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1226 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1177 ["Ignore cursed" => PICKUP_NOT_CURSED], 1227 ["Ignore cursed" => PICKUP_NOT_CURSED],
1178 ["Jewelery" => PICKUP_JEWELS], 1228 ["Jewelery" => PICKUP_JEWELS],
1229 ["Flesh" => PICKUP_FLESH],
1179 ], 1230 ],
1180 ["Weight/Value ratio", 2, 17] 1231 ["Weight/Value ratio", 2, 17]
1181 ) 1232 )
1182 { 1233 {
1183 my ($title, $x, $y, @bits) = @$_; 1234 my ($title, $x, $y, @bits) = @$_;
… …
1233 $table 1284 $table
1234} 1285}
1235 1286
1236my %SORT_ORDER = ( 1287my %SORT_ORDER = (
1237 type => undef, 1288 type => undef,
1238 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
1239 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1295 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1240 or $b->{mtime} <=> $a->{mtime} 1296 or $btime <=> $atime
1241 or $a->{type} <=> $b->{type} 1297 or $a->{type} <=> $b->{type}
1298 } @_
1242 } @_ }, 1299 },
1243 weight => sub { sort { 1300 weight => sub { sort {
1244 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1301 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1245 or $a->{type} <=> $b->{type} 1302 or $a->{type} <=> $b->{type}
1246 } @_ }, 1303 } @_ },
1247); 1304);
… …
1272 #TODO# update to weigh/maxweight 1329 #TODO# update to weigh/maxweight
1273 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1330 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1274 1331
1275 $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);
1276 $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}});
1277 1335
1278 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1336 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1279 1337
1280 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1338 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1281 1339
… …
1321 $ntb->add ( 1379 $ntb->add (
1322 "Skills (F3)" => $SKILL_PAGE = skill_window, 1380 "Skills (F3)" => $SKILL_PAGE = skill_window,
1323 "Shows all your Skills." 1381 "Shows all your Skills."
1324 ); 1382 );
1325 1383
1326 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);
1327 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1385 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1328 $ntb->add ( 1386 $ntb->add (
1329 "Spellbook (F4)" => $spellsw, 1387 "Spellbook (F4)" => $spellsw,
1330 "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."
1331 ); 1389 );
1332 $ntb->add ( 1390 $ntb->add (
… …
1339 1397
1340 $plwin->add ($ntb); 1398 $plwin->add ($ntb);
1341 $plwin 1399 $plwin
1342} 1400}
1343 1401
1344sub update_bindings {
1345 $BIND_UPD_CB->() if $BIND_UPD_CB;
1346}
1347
1348sub keyboard_setup { 1402sub keyboard_setup {
1349 my $binding_list = new CFPlus::UI::VBox; 1403 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} 1404}
1462 1405
1463sub help_window { 1406sub help_window {
1464 my $win = new CFPlus::UI::Toplevel 1407 my $win = new CFPlus::UI::Toplevel
1465 x => 'center', 1408 x => 'center',
… …
1650 1593
1651 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1652 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1595 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]); 1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1654 1597
1655 $vbox->add (my $table = new CFPlus::UI::Table); 1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1656 1599
1657 $table->add (0, 0, new CFPlus::UI::Button 1600 $table->add (0, 0, new CFPlus::UI::Button
1658 text => "Close", 1601 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>.", 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>.",
1660 on_activate => $close, 1603 on_activate => $close,
1661 ); 1604 );
1662 1605
1663 $table->add (2, 0, new CFPlus::UI::Button 1606 $table->add (2, 0, new CFPlus::UI::Button
1664 text => "Next", 1607 text => "Next",
1665 tooltip => "Show the next <b>Tip of the day</b>.", 1608 tooltip => "Show the next <b>Tip of the day</b>.",
1666 on_activate => sub { 1609 on_activate => sub {
1667 $close->(); 1610 $close->();
1668 &show_tip_of_the_day; 1611 &show_tip_of_the_day;
1669 }, 1612 },
… …
1711 padding => 0, 1654 padding => 0,
1712 z => 100, 1655 z => 100,
1713 force_x => "max", 1656 force_x => "max",
1714 force_y => 0; 1657 force_y => 0;
1715 $DEBUG_STATUS->show; 1658 $DEBUG_STATUS->show;
1716
1717 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1718 1659
1719 $STATUSBOX = new CFPlus::UI::Statusbox; 1660 $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]); 1661 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1721 1662
1722 (new CFPlus::UI::Frame 1663 (new CFPlus::UI::Frame
… …
1823 ); 1764 );
1824 1765
1825 $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,
1826 tooltip => "View Documentation"); 1767 tooltip => "View Documentation");
1827 1768
1769
1828 $BUTTONBAR->add (new CFPlus::UI::Button 1770 $BUTTONBAR->add (new CFPlus::UI::Button
1829 text => "Quit", 1771 text => "Quit",
1830 tooltip => "Terminates the program", 1772 tooltip => "Terminates the program",
1831 on_activate => sub { 1773 on_activate => sub {
1832 if ($CONN) { 1774 if ($CONN) {
… …
1843 } 1785 }
1844 1786
1845 $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]);
1846} 1788}
1847 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
1848sub video_shutdown { 1909sub video_shutdown {
1849 CFPlus::OpenGL::shutdown; 1910 CFPlus::OpenGL::shutdown;
1850 1911
1851 undef $SDL_ACTIVE; 1912 undef $SDL_ACTIVE;
1852} 1913}
… …
1883 CFPlus::Mix_AllocateChannels 8; 1944 CFPlus::Mix_AllocateChannels 8;
1884 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1945 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1885 1946
1886 audio_music_finished; 1947 audio_music_finished;
1887 1948
1949 local $_;
1888 while (<$fh>) { 1950 while (<$fh>) {
1889 next if /^\s*#/; 1951 next if /^\s*#/;
1890 next if /^\s*$/; 1952 next if /^\s*$/;
1891 1953
1892 my ($file, $volume, $event) = split /\s+/, $_, 3; 1954 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1977 }, 2039 },
1978 CFPlus::SDL_VIDEOEXPOSE => sub { 2040 CFPlus::SDL_VIDEOEXPOSE => sub {
1979 CFPlus::UI::full_refresh; 2041 CFPlus::UI::full_refresh;
1980 }, 2042 },
1981 CFPlus::SDL_ACTIVEEVENT => sub { 2043 CFPlus::SDL_ACTIVEEVENT => sub {
1982# 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;
1983 }, 2049 },
1984 CFPlus::SDL_KEYDOWN => sub { 2050 CFPlus::SDL_KEYDOWN => sub {
1985 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2051 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1986 # alt-enter 2052 # alt-enter
1987 $FULLSCREEN_ENABLE->toggle; 2053 $FULLSCREEN_ENABLE->toggle;
… …
2026 log_fontsize => 0.7, 2092 log_fontsize => 0.7,
2027 gauge_fontsize => 1, 2093 gauge_fontsize => 1,
2028 gauge_size => 0.35, 2094 gauge_size => 0.35,
2029 stat_fontsize => 0.7, 2095 stat_fontsize => 0.7,
2030 mapsize => 100, 2096 mapsize => 100,
2031 say_command => 'say', 2097 say_command => 'chat',
2032 audio_enable => 1, 2098 audio_enable => 1,
2033 bgm_enable => 1, 2099 bgm_enable => 1,
2034 bgm_volume => 0.25, 2100 bgm_volume => 0.25,
2035 face_prefetch => 0, 2101 face_prefetch => 0,
2036 output_sync => 1, 2102 output_sync => 1,
… …
2044 while (my ($k, $v) = each %DEF_CFG) { 2110 while (my ($k, $v) = each %DEF_CFG) {
2045 $CFG->{$k} = $v unless exists $CFG->{$k}; 2111 $CFG->{$k} = $v unless exists $CFG->{$k};
2046 } 2112 }
2047 2113
2048 $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 }
2049 2128
2050 sdl_init; 2129 sdl_init;
2051 2130
2052 @SDL_MODES = reverse 2131 @SDL_MODES = reverse
2053 grep $_->[0] >= 640 && $_->[1] >= 480, 2132 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2090# } 2169# }
2091# my $t2 = Time::HiRes::time; 2170# my $t2 = Time::HiRes::time;
2092# warn $t2-$t1; 2171# warn $t2-$t1;
2093# } 2172# }
2094 2173
2174 $startup_done->();
2175
2095 video_init; 2176 video_init;
2096 audio_init; 2177 audio_init;
2097} 2178}
2098 2179
2099show_tip_of_the_day if $CFG->{show_tips}; 2180show_tip_of_the_day if $CFG->{show_tips};
2100
2101use Data::Dumper; warn Dumper [CFPlus::win32_proxy_info()];#d#
2102 2181
2103Event::loop; 2182Event::loop;
2104#CFPlus::SDL_Quit; 2183#CFPlus::SDL_Quit;
2105#CFPlus::_exit 0; 2184#CFPlus::_exit 0;
2106 2185

Diff Legend

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