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.115 by root, Mon Aug 14 03:41:29 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 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
… …
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 68$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 69$SIG{PIPE} = 'IGNORE';
47 70
48$Event::Eval = 0; 71$Event::Eval = 0;
49$Event::DIED = sub { 72$Event::DIED = sub {
50 # TODO: display dialog box or so 73 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 74};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 75
66my $MAX_FPS = 60; 76my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
68 78
69our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 80
71our $LAST_REFRESH; 81our $LAST_REFRESH;
72our $NOW; 82our $NOW;
73 83
74our $CFG; 84our $CFG;
75our $CONN; 85our $CONN;
86our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 87our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 88
78our $WANT_REFRESH; 89our $WANT_REFRESH;
79our $CAN_REFRESH; 90our $CAN_REFRESH;
80 91
… …
111 122
112our $INVENTORY_PAGE; 123our $INVENTORY_PAGE;
113our $STATS_PAGE; 124our $STATS_PAGE;
114our $SKILL_PAGE; 125our $SKILL_PAGE;
115our $SPELL_PAGE; 126our $SPELL_PAGE;
127our $SPELL_LIST;
116 128
117our $HELP_WINDOW; 129our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 130our $MESSAGE_WINDOW;
119our $FLOORBOX; 131our $FLOORBOX;
120our $GAUGES; 132our $GAUGES;
… …
138our $BIND_EDITOR; 150our $BIND_EDITOR;
139our $BIND_UPD_CB; 151our $BIND_UPD_CB;
140 152
141our $PICKUP_CFG; 153our $PICKUP_CFG;
142 154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
143sub status { 158sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 160}
146 161
147sub debug { 162sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
164}
165
166sub message {
167 my ($para) = @_;
168
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
149} 175}
150 176
151sub destroy_query_dialog { 177sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
… …
352 status "logging in..."; 378 status "logging in...";
353 379
354 $LOGIN_BUTTON->set_text ("Logout"); 380 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 381 $SETUP_DIALOG->hide;
356 382
383 $PROFILE = $CFG->{profile}{default};
384
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 386
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 387 my ($host, $port) = split /:/, $PROFILE->{host};
360 388
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 389 $MAP = new CFPlus::Map;
362 390
363 $CONN = eval { 391 $CONN = eval {
364 new CFPlus::Protocol 392 new CFPlus::Protocol
365 host => $host, 393 host => $host,
366 port => $port || 13327, 394 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 395 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 396 pass => $PROFILE->{password},
369 mapw => $mapsize, 397 mapw => $mapsize,
370 maph => $mapsize, 398 maph => $mapsize,
399
400 client => "cfplus $CFPlus::VERSION $] $^O",
371 401
372 map_widget => $MAPWIDGET, 402 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 403 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 404 statusbox => $STATUSBOX,
375 map => $MAP, 405 map => $MAP,
… …
402sub stop_game { 432sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 433 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 435 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 436 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 437 $SPELL_LIST->clear_spells;
408 438
409 return unless $CONN; 439 return unless $CONN;
410 440
411 status "connection closed"; 441 status "connection closed";
412 442
… …
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 670 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 671 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 672 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 673 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
644 675
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 677
647 for my $x (0..2) { 678 for my $x (0..2) {
648 for my $y (0 .. 2) { 679 for my $y (0 .. 2) {
… …
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 ); 684 );
654 } 685 }
655 } 686 }
656 687
688 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 689
658 $table 690 $table
659} 691}
660 692
661sub stats_window { 693sub stats_window {
… …
830 862
831 my $table = $METASERVER->{table}; 863 my $table = $METASERVER->{table};
832 $table->clear; 864 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 865 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 866
835 my $buf; 867 my $ok = 0;
836 868
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 869 CFPlus::background {
870 my $ua = CFPlus::lwp_useragent;
838 871
839 unless ($fh) { 872 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 873 } sub {
841 return; 874 my ($msg) = @_;
842 } 875 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 876 $table->clear;
857 877
858 my @tip = ( 878 my @tip = (
859 "The current number of users logged in on the server.", 879 "The current number of users logged in on the server.",
860 "The hostname of the server.", 880 "The hostname of the server.",
… …
870 for 0 .. $#col; 890 for 0 .. $#col;
871 891
872 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
873 893
874 my $y = 0; 894 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} }
901 ) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
877 904
878 for ($desc) { 905 for ($desc) {
879 s/<br>/\n/gi; 906 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 907 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 908 s/<.*?>//sgi;
882 s/&/&amp;/g; 909 s/&amp;/&/g;
883 s/</&lt;/g; 910 s/&lt;/</g;
884 s/>/&gt;/g; 911 s/&gt;/>/g;
885 } 912 }
886 913
887 $uptime = sprintf "%dd %02d:%02d:%02d", 914 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 915 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 916 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 917 (int $uptime / 60) % 60,
891 $m->[8] % 60; 918 $uptime % 60;
892 919
893 $m = [$users, $host, $uptime, $version, $desc]; 920 $m = [$users, $host, $uptime, $version, $desc];
894 921
895 $y++; 922 $y++;
896 923
… …
906 ), 933 ),
907 (new CFPlus::UI::Empty expand => 1), 934 (new CFPlus::UI::Empty expand => 1),
908 ]); 935 ]);
909 936
910 $table->add ($_, $y, new CFPlus::UI::Label 937 $table->add ($_, $y, new CFPlus::UI::Label
938 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 939 ellipsise => 0,
912 align => $align[$_], 940 align => $align[$_],
913 text => $m->[$_], 941 text => $m->[$_],
914 tooltip => $tip[$_], 942 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 944 can_hover => 1,
916 can_events => 1, 945 can_events => 1,
917 fontsize => 0.8) 946 fontsize => 0.8)
918 for 0 .. $#$m; 947 for 0 .. $#$m;
919 } 948 }
949 } else {
950 $ok or $label->set_text ("error while contacting metaserver");
920 } 951 }
921 }); 952 };
953
922} 954}
923 955
924sub metaserver_dialog { 956sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 957 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 958 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 962 title => "Server List",
931 name => 'metaserver_dialog', 963 name => 'metaserver_dialog',
932 x => 'center', 964 x => 'center',
933 y => 'center', 965 y => 'center',
934 z => 3, 966 z => 3,
967 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 968 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 969 child => $vbox,
937 has_close_button => 1, 970 has_close_button => 1,
938 table => $table, 971 table => $table,
939 on_visibility_change => sub { 972 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 973 update_metaserver ($_[0]) if $_[1];
… …
1043 }, 1076 },
1044 ); 1077 );
1045 1078
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1079 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1081 text => $CFG->{say_command},
1049 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1082 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1083 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1084 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub { 1085 on_changed => sub {
1053 my ($self, $value) = @_; 1086 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value; 1087 $CFG->{say_command} = $value;
1088 0
1089 }
1090 );
1091
1092 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1093 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips},
1095 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1096 on_changed => sub {
1097 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value;
1055 0 1099 0
1056 } 1100 }
1057 ); 1101 );
1058 1102
1059 $vbox->add (new CFPlus::UI::FancyFrame 1103 $vbox->add (new CFPlus::UI::FancyFrame
… …
1123 window => $window, 1167 window => $window,
1124 input => $input, 1168 input => $input,
1125 }; 1169 };
1126 1170
1127 $window 1171 $window
1128}
1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1160 ;
1161
1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164 $vb->add (new CFPlus::UI::Label
1165 text => "You should find a savebed and apply it first!",
1166 max_w => $WIDTH * 0.25,
1167 ellipsize => 0,
1168 );
1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170 $hb->add (new CFPlus::UI::Button
1171 text => "Ok",
1172 expand => 1,
1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174 );
1175 $hb->add (new CFPlus::UI::Button
1176 text => "Quit anyway",
1177 expand => 1,
1178 on_activate => sub { exit },
1179 );
1180 }
1181
1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1184} 1172}
1185 1173
1186sub autopickup_setup { 1174sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1175 my $table = new CFPlus::UI::Table;
1188 1176
… …
1206 ["Boots" => PICKUP_BOOTS], 1194 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1195 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1196 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1197 ],
1210 1198
1211 ["Readables", 2, 2, 1199 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1200 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1201 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1202 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1203 ],
1216 ["Misc", 2, 7, 1204 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1205 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1206 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1207 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1208 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1209 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1210 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1211 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1212 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1213 ["Jewelery" => PICKUP_JEWELS],
1214 ["Flesh" => PICKUP_FLESH],
1226 ], 1215 ],
1227 ["Weight/Value ratio", 2, 17] 1216 ["Weight/Value ratio", 2, 17]
1228 ) 1217 )
1229 { 1218 {
1230 my ($title, $x, $y, @bits) = @$_; 1219 my ($title, $x, $y, @bits) = @$_;
… …
1280 $table 1269 $table
1281} 1270}
1282 1271
1283my %SORT_ORDER = ( 1272my %SORT_ORDER = (
1284 type => undef, 1273 type => undef,
1285 mtime => sub { sort { 1274 mtime => sub {
1275 my $NOW = time;
1276 sort {
1277 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1278 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1279
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1280 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1281 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1283 } @_
1289 } @_ }, 1284 },
1290 weight => sub { sort { 1285 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1286 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1287 or $a->{type} <=> $b->{type}
1293 } @_ }, 1288 } @_ },
1294); 1289);
… …
1319 #TODO# update to weigh/maxweight 1314 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1315 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1316
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1317 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1318 $sw1->add ($INV = new CFPlus::UI::Inventory);
1319 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1320
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1321 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1322
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1323 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1324
… …
1368 $ntb->add ( 1364 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1365 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1366 "Shows all your Skills."
1371 ); 1367 );
1372 1368
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1369 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1370 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1371 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1372 "Spellbook (F4)" => $spellsw,
1377 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1373 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1378 ); 1374 );
1379 $ntb->add ( 1375 $ntb->add (
… …
1397 1393
1398 my $refresh; 1394 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub { 1395 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear (); 1396 $binding_list->clear ();
1401 1397
1398 return unless $PROFILE;
1399
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406 1404
1407 my $lbl = join "; ", @$cmds; 1405 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button 1408 $hb->add (new CFPlus::UI::Button
1411 text => "delete", 1409 text => "delete",
1412 tooltip => "Deletes the binding", 1410 tooltip => "Deletes the binding",
1413 on_activate => sub { 1411 on_activate => sub {
1414 $binding_list->remove ($hb); 1412 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1413 delete $PROFILE->{bindings}{$mod}{$sym};
1416 0 1414 0
1417 }); 1415 });
1418 1416
1419 $hb->add (new CFPlus::UI::Button 1417 $hb->add (new CFPlus::UI::Button
1420 text => "edit", 1418 text => "edit",
1421 tooltip => "Edits the binding", 1419 tooltip => "Edits the binding",
1422 on_activate => sub { 1420 on_activate => sub {
1423 $::BIND_EDITOR->set_binding ( 1421 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1425 sub { 1423 sub {
1426 my ($nmod, $nsym, $ncmds) = @_; 1424 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->(); 1427 $refresh->();
… …
1507 1505
1508sub help_window { 1506sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1507 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1508 x => 'center',
1511 y => 'center', 1509 y => 'center',
1512 z => 2, 1510 z => 4,
1513 name => 'doc_browser', 1511 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1512 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1513 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1514 title => "Help Browser",
1517 has_close_button => 1; 1515 has_close_button => 1;
… …
1532 my $load_node; $load_node = sub { 1530 my $load_node; $load_node = sub {
1533 my ($node, $para) = @_; 1531 my ($node, $para) = @_;
1534 1532
1535 $buttons->clear; 1533 $buttons->clear;
1536 1534
1535 $buttons->add (new CFPlus::UI::Button
1536 text => "⇤",
1537 tooltip => "back to the starting page",
1538 on_activate => sub {
1539 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1540 unshift @future, @history;
1541 @history = ();
1542 $load_node->(@{shift @future});
1543 },
1544 );
1545
1537 if (@history) { 1546 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1547 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1548 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1549 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1550 on_activate => sub {
1542 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1551 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(@{pop @history}); 1552 $load_node->(@{pop @history});
1544 }, 1553 },
1545 ); 1554 );
1546 } 1555 }
1547 1556
1548 if (@future) { 1557 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1558 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1559 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1560 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1561 on_activate => sub {
1553 push @history, [$curnode, $viewer->current_paragraph]; 1562 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(@{shift @future}); 1563 $load_node->(@{shift @future});
1555 }, 1564 },
1556 ); 1565 );
… …
1587 $CFPlus::Pod::goto_document = sub { 1596 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1597 my (@path) = @_;
1589 1598
1590 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1599 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1600
1592 $load_node->(CFPlus::Pod::find @path); 1601 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1602 $win->show;
1594 }; 1603 };
1595 1604
1596 $win 1605 $win
1606}
1607
1608sub open_string_query {
1609 my ($title, $cb, $txt, $tooltip) = @_;
1610 my $dialog = new CFPlus::UI::Toplevel
1611 x => "center",
1612 y => "center",
1613 z => 50,
1614 force_w => $WIDTH * 4/5,
1615 title => $title;
1616
1617 $dialog->add (
1618 my $e = new CFPlus::UI::Entry
1619 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1620 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1621 tooltip => $tooltip
1622 );
1623
1624 $e->grab_focus;
1625 $e->set_text ($txt) if $txt;
1626 $dialog->show;
1627}
1628
1629sub open_quit_dialog {
1630 unless ($QUIT_DIALOG) {
1631 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1632 x => "center",
1633 y => "center",
1634 z => 50,
1635 title => "Really Quit?",
1636 on_key_down => sub {
1637 my ($dialog, $ev) = @_;
1638 $ev->{sym} == 27 and $dialog->hide;
1639 }
1640 ;
1641
1642 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1643
1644 $vb->add (new CFPlus::UI::Label
1645 text => "You should find a savebed and apply it first!",
1646 max_w => $WIDTH * 0.25,
1647 ellipsize => 0,
1648 );
1649 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1650 $hb->add (new CFPlus::UI::Button
1651 text => "Ok",
1652 expand => 1,
1653 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1654 );
1655 $hb->add (new CFPlus::UI::Button
1656 text => "Quit anyway",
1657 expand => 1,
1658 on_activate => sub { exit },
1659 );
1660 }
1661
1662 $QUIT_DIALOG->show;
1663 $QUIT_DIALOG->grab_focus;
1664}
1665
1666sub show_tip_of_the_day {
1667 # find all tips
1668 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1669
1670 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1671 $todindex = 0 if $todindex >= @tod;
1672 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1673
1674 # create dialog
1675 my $dialog;
1676
1677 my $close = sub {
1678 $dialog->destroy;
1679 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1597} 1716}
1598 1717
1599sub sdl_init { 1718sub sdl_init {
1600 CFPlus::SDL_Init 1719 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1720 and die "SDL::Init failed!\n";
… …
1747 ); 1866 );
1748 1867
1749 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1868 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1750 tooltip => "View Documentation"); 1869 tooltip => "View Documentation");
1751 1870
1871
1752 $BUTTONBAR->add (new CFPlus::UI::Button 1872 $BUTTONBAR->add (new CFPlus::UI::Button
1753 text => "Quit", 1873 text => "Quit",
1754 tooltip => "Terminates the program", 1874 tooltip => "Terminates the program",
1755 on_activate => sub { 1875 on_activate => sub {
1756 if ($CONN) { 1876 if ($CONN) {
… …
1767 } 1887 }
1768 1888
1769 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1889 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1770} 1890}
1771 1891
1892sub setup_build_button {
1893 my ($enabled) = @_;
1894 if ($enabled) {
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build",
1897 tooltip => "Opens the ingame builder",
1898 on_activate => sub {
1899 if ($CONN) {
1900 $CONN->send_ext_req (builder_player_items => sub {
1901 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1902 });
1903 }
1904 0
1905 };
1906 $BUTTONBAR->add ($BUILD_BUTTON);
1907 } else {
1908 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1909 }
1910}
1911
1912sub open_ingame_editor {
1913 my ($msg) = @_;
1914
1915 my $win = new CFPlus::UI::Toplevel
1916 x => 0,
1917 y => 'center',
1918 z => 4,
1919 name => 'builder_window',
1920 force_w => int $WIDTH * 1/4,
1921 force_h => int $HEIGHT * 3/4,
1922 title => "In game builder",
1923 has_close_button => 1;
1924
1925 my $r = new CFPlus::UI::ScrolledWindow (
1926 expand => 1,
1927 scroll_y => 1
1928 );
1929 $r->add (my $vb = new CFPlus::UI::VBox);
1930 $win->add ($r);
1931
1932
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "Disable build mode",
1936 on_activate => sub { $::IN_BUILD_MODE = undef }
1937 );
1938 $vb->add (
1939 new CFPlus::UI::Button
1940 text => "ERASE",
1941 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1942 );
1943
1944 for my $itemarchname (
1945 sort {
1946 $msg->{items}->{$a}->{build_arch_name}
1947 cmp $msg->{items}->{$b}->{build_arch_name}
1948 } keys %{$msg->{items}}
1949 ) {
1950 my $info = $msg->{items}->{$itemarchname};
1951 $vb->add (
1952 new CFPlus::UI::Button text => $info->{build_arch_name},
1953 on_activate => sub {
1954 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1955
1956 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1957 build_mode_query_arch_info ();
1958 }
1959 }
1960 );
1961 }
1962
1963 $win->show;
1964}
1965
1966sub build_mode_query_arch_info {
1967 my ($iteminfo) = $::IN_BUILD_MODE;
1968 my $itemarchname = $iteminfo->{item};
1969 my $info = $iteminfo->{info};
1970
1971 my $dialog = new CFPlus::UI::Toplevel
1972 x => "center",
1973 y => "center",
1974 z => 50,
1975 force_w => int $WIDTH * 1/2,
1976 title => "Enter information for placement of '$itemarchname'",
1977 has_close_button => 1;
1978
1979 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1980
1981 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1982 my $row = 0;
1983 if ($info->{has_name}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1986 }
1987 if ($info->{has_text}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1989 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1990 }
1991 if ($info->{has_connection}) {
1992 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1993 $table->add (1, $row++,
1994 new CFPlus::UI::Entry
1995 expand => 1,
1996 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1997 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1998 );
1999 }
2000
2001 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2002 $hb->add (new CFPlus::UI::Button
2003 text => "Close",
2004 expand => 1,
2005 on_activate => sub { $dialog->hide; 0 },
2006 );
2007 $dialog->show;
2008}
2009
1772sub video_shutdown { 2010sub video_shutdown {
1773 CFPlus::OpenGL::shutdown; 2011 CFPlus::OpenGL::shutdown;
1774 2012
1775 undef $SDL_ACTIVE; 2013 undef $SDL_ACTIVE;
1776} 2014}
… …
1807 CFPlus::Mix_AllocateChannels 8; 2045 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2046 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 2047
1810 audio_music_finished; 2048 audio_music_finished;
1811 2049
2050 local $_;
1812 while (<$fh>) { 2051 while (<$fh>) {
1813 next if /^\s*#/; 2052 next if /^\s*#/;
1814 next if /^\s*$/; 2053 next if /^\s*$/;
1815 2054
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 2055 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1950 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2191 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
1954 mapsize => 100, 2193 mapsize => 100,
1955 say_command => 'say', 2194 say_command => 'chat',
1956 audio_enable => 1, 2195 audio_enable => 1,
1957 bgm_enable => 1, 2196 bgm_enable => 1,
1958 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
1959 face_prefetch => 0, 2198 face_prefetch => 0,
1960 output_sync => 1, 2199 output_sync => 1,
1961 output_count => 1, 2200 output_count => 1,
1962 pickup => 0, 2201 pickup => 0,
1963 inv_sort => "mtime", 2202 inv_sort => "mtime",
1964 default => "profile", # default profile 2203 default => "profile", # default profile
2204 show_tips => 1,
1965 ); 2205 );
1966 2206
1967 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2209 }
… …
2013# } 2253# }
2014# my $t2 = Time::HiRes::time; 2254# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2255# warn $t2-$t1;
2016# } 2256# }
2017 2257
2258 $startup_done->();
2259
2018 video_init; 2260 video_init;
2019 audio_init; 2261 audio_init;
2020} 2262}
2263
2264show_tip_of_the_day if $CFG->{show_tips};
2021 2265
2022Event::loop; 2266Event::loop;
2023#CFPlus::SDL_Quit; 2267#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2268#CFPlus::_exit 0;
2025 2269

Diff Legend

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