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.140 by elmex, Sat Dec 16 16:01:09 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 CFPlus::error $_[1];
53}; 76};
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 77
66my $MAX_FPS = 60; 78my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
68 80
69our $META_SERVER = "crossfire.real-time.com:13326"; 81our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 82
71our $LAST_REFRESH; 83our $LAST_REFRESH;
72our $NOW; 84our $NOW;
73 85
74our $CFG; 86our $CFG;
75our $CONN; 87our $CONN;
88our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 89our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 90
78our $WANT_REFRESH; 91our $WANT_REFRESH;
79our $CAN_REFRESH; 92our $CAN_REFRESH;
80 93
… …
111 124
112our $INVENTORY_PAGE; 125our $INVENTORY_PAGE;
113our $STATS_PAGE; 126our $STATS_PAGE;
114our $SKILL_PAGE; 127our $SKILL_PAGE;
115our $SPELL_PAGE; 128our $SPELL_PAGE;
129our $SPELL_LIST;
116 130
117our $HELP_WINDOW; 131our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 132our $MESSAGE_WINDOW;
119our $FLOORBOX; 133our $FLOORBOX;
120our $GAUGES; 134our $GAUGES;
… …
133 147
134our $INV; 148our $INV;
135our $INVR; 149our $INVR;
136our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
137 151
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
142 156
143sub status { 157sub status {
144 $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]);
145} 159}
146 160
147sub debug { 161sub debug {
148 $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;
149} 174}
150 175
151sub destroy_query_dialog { 176sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 379 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 380 $SETUP_DIALOG->hide;
356 381
357 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;
358 383
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
360 385
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
362 387
363 $CONN = eval { 388 $CONN = eval {
364 new CFPlus::Protocol 389 new CFPlus::Protocol
365 host => $host, 390 host => $host,
366 port => $port || 13327, 391 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 392 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 393 pass => $PROFILE->{password},
369 mapw => $mapsize, 394 mapw => $mapsize,
370 maph => $mapsize, 395 maph => $mapsize,
396
397 client => "cfplus $CFPlus::VERSION $] $^O",
371 398
372 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 400 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
375 map => $MAP, 402 map => $MAP,
… …
402sub stop_game { 429sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
408 435
409 return unless $CONN; 436 return unless $CONN;
410 437
411 status "connection closed"; 438 status "connection closed";
412 439
… …
639 $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 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 667 $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 }); 668 $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"); 669 $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 }); 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" } );
644 672
645 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);
646 674
647 for my $x (0..2) { 675 for my $x (0..2) {
648 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
652 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 },
653 ); 681 );
654 } 682 }
655 } 683 }
656 684
685 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 686
658 $table 687 $table
659} 688}
660 689
661sub stats_window { 690sub stats_window {
… …
830 859
831 my $table = $METASERVER->{table}; 860 my $table = $METASERVER->{table};
832 $table->clear; 861 $table->clear;
833 $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...");
834 863
835 my $buf; 864 my $ok = 0;
836 865
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 866 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent;
838 868
839 unless ($fh) { 869 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 870 } sub {
841 return; 871 my ($msg) = @_;
842 } 872 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; 873 $table->clear;
857 874
858 my @tip = ( 875 my @tip = (
859 "The current number of users logged in on the server.", 876 "The current number of users logged in on the server.",
860 "The hostname of the server.", 877 "The hostname of the server.",
… …
870 for 0 .. $#col; 887 for 0 .. $#col;
871 888
872 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
873 890
874 my $y = 0; 891 my $y = 0;
875 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 ) {
876 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)};
877 901
878 for ($desc) { 902 for ($desc) {
879 s/<br>/\n/gi; 903 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 904 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 905 s/<.*?>//sgi;
882 s/&/&amp;/g; 906 s/&amp;/&/g;
883 s/</&lt;/g; 907 s/&lt;/</g;
884 s/>/&gt;/g; 908 s/&gt;/>/g;
885 } 909 }
886 910
887 $uptime = sprintf "%dd %02d:%02d:%02d", 911 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 912 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 913 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 914 (int $uptime / 60) % 60,
891 $m->[8] % 60; 915 $uptime % 60;
892 916
893 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
894 918
895 $y++; 919 $y++;
896 920
… …
906 ), 930 ),
907 (new CFPlus::UI::Empty expand => 1), 931 (new CFPlus::UI::Empty expand => 1),
908 ]); 932 ]);
909 933
910 $table->add ($_, $y, new CFPlus::UI::Label 934 $table->add ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 936 ellipsise => 0,
912 align => $align[$_], 937 align => $align[$_],
913 text => $m->[$_], 938 text => $m->[$_],
914 tooltip => $tip[$_], 939 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 941 can_hover => 1,
916 can_events => 1, 942 can_events => 1,
917 fontsize => 0.8) 943 fontsize => 0.8)
918 for 0 .. $#$m; 944 for 0 .. $#$m;
919 } 945 }
946 } else {
947 $ok or $label->set_text ("error while contacting metaserver");
920 } 948 }
921 }); 949 };
950
922} 951}
923 952
924sub metaserver_dialog { 953sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 954 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 955 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 959 title => "Server List",
931 name => 'metaserver_dialog', 960 name => 'metaserver_dialog',
932 x => 'center', 961 x => 'center',
933 y => 'center', 962 y => 'center',
934 z => 3, 963 z => 3,
964 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 965 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 966 child => $vbox,
937 has_close_button => 1, 967 has_close_button => 1,
938 table => $table, 968 table => $table,
939 on_visibility_change => sub { 969 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 970 update_metaserver ($_[0]) if $_[1];
… …
1043 }, 1073 },
1044 ); 1074 );
1045 1075
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1076 $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 1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1078 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. " 1079 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. " 1080 . "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.", 1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub { 1082 on_changed => sub {
1053 my ($self, $value) = @_; 1083 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value; 1084 $CFG->{say_command} = $value;
1085 0
1086 }
1087 );
1088
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub {
1094 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value;
1055 0 1096 0
1056 } 1097 }
1057 ); 1098 );
1058 1099
1059 $vbox->add (new CFPlus::UI::FancyFrame 1100 $vbox->add (new CFPlus::UI::FancyFrame
… …
1123 window => $window, 1164 window => $window,
1124 input => $input, 1165 input => $input,
1125 }; 1166 };
1126 1167
1127 $window 1168 $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} 1169}
1185 1170
1186sub autopickup_setup { 1171sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1172 my $table = new CFPlus::UI::Table;
1188 1173
… …
1206 ["Boots" => PICKUP_BOOTS], 1191 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1192 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1193 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1194 ],
1210 1195
1211 ["Readables", 2, 2, 1196 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1197 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1198 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1199 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1200 ],
1216 ["Misc", 2, 7, 1201 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1202 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1203 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1204 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1205 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1206 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1207 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1208 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1209 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1210 ["Jewelery" => PICKUP_JEWELS],
1211 ["Flesh" => PICKUP_FLESH],
1226 ], 1212 ],
1227 ["Weight/Value ratio", 2, 17] 1213 ["Weight/Value ratio", 2, 17]
1228 ) 1214 )
1229 { 1215 {
1230 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
… …
1280 $table 1266 $table
1281} 1267}
1282 1268
1283my %SORT_ORDER = ( 1269my %SORT_ORDER = (
1284 type => undef, 1270 type => undef,
1285 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
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1277 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1278 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1279 or $a->{type} <=> $b->{type}
1280 } @_
1289 } @_ }, 1281 },
1290 weight => sub { sort { 1282 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1283 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1284 or $a->{type} <=> $b->{type}
1293 } @_ }, 1285 } @_ },
1294); 1286);
… …
1319 #TODO# update to weigh/maxweight 1311 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1312 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1313
1322 $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);
1323 $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}});
1324 1317
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1318 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1319
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1320 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1321
… …
1368 $ntb->add ( 1361 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1362 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1363 "Shows all your Skills."
1371 ); 1364 );
1372 1365
1373 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);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1368 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1369 "Spellbook (F4)" => $spellsw,
1377 "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."
1378 ); 1371 );
1379 $ntb->add ( 1372 $ntb->add (
… …
1386 1379
1387 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1388 $plwin 1381 $plwin
1389} 1382}
1390 1383
1391sub update_bindings {
1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1393}
1394
1395sub keyboard_setup { 1384sub keyboard_setup {
1396 my $binding_list = new CFPlus::UI::VBox; 1385 CFPlus::Macro::keyboard_setup
1397
1398 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear ();
1401
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406
1407 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button
1411 text => "delete",
1412 tooltip => "Deletes the binding",
1413 on_activate => sub {
1414 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1416 0
1417 });
1418
1419 $hb->add (new CFPlus::UI::Button
1420 text => "edit",
1421 tooltip => "Edits the binding",
1422 on_activate => sub {
1423 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1425 sub {
1426 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->();
1430 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1431 $SETUP_DIALOG->show;
1432 },
1433 sub {
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 });
1437 $::BIND_EDITOR->show;
1438 $SETUP_DIALOG->hide;
1439 0
1440 });
1441
1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1444 }
1445 }
1446 };
1447
1448 my $vb = new CFPlus::UI::VBox;
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1454 $hb->add (new CFPlus::UI::CheckBox
1455 expand => 1,
1456 state => $CFG->{shift_fire_stop},
1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1458 on_changed => sub {
1459 my ($cbox, $value) = @_;
1460 $CFG->{shift_fire_stop} = $value;
1461 0
1462 });
1463
1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1468
1469 $hb->add (new CFPlus::UI::Button
1470 text => "record new",
1471 expand => 1,
1472 tooltip => "This button opens the binding editor with an empty binding.",
1473 on_activate => sub {
1474 $::BIND_EDITOR->set_binding (undef, undef, [],
1475 sub {
1476 my ($mod, $sym, $cmds) = @_;
1477 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1478 $refresh->();
1479 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1480 $SETUP_DIALOG->show;
1481 },
1482 sub {
1483 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484 $SETUP_DIALOG->show;
1485 },
1486 );
1487 $SETUP_DIALOG->hide;
1488 $::BIND_EDITOR->show;
1489 0
1490 },
1491 );
1492
1493 $hb->add (new CFPlus::UI::Button
1494 text => "close",
1495 tooltip => "Closes the binding window",
1496 expand => 1,
1497 on_activate => sub {
1498 $SETUP_DIALOG->hide;
1499 0
1500 }
1501 );
1502
1503 $refresh->();
1504
1505 $vb
1506} 1386}
1507 1387
1508sub help_window { 1388sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1389 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1390 x => 'center',
1511 y => 'center', 1391 y => 'center',
1512 z => 2, 1392 z => 4,
1513 name => 'doc_browser', 1393 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1394 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1395 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1396 title => "Help Browser",
1517 has_close_button => 1; 1397 has_close_button => 1;
… …
1532 my $load_node; $load_node = sub { 1412 my $load_node; $load_node = sub {
1533 my ($node, $para) = @_; 1413 my ($node, $para) = @_;
1534 1414
1535 $buttons->clear; 1415 $buttons->clear;
1536 1416
1417 $buttons->add (new CFPlus::UI::Button
1418 text => "⇤",
1419 tooltip => "back to the starting page",
1420 on_activate => sub {
1421 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1422 unshift @future, @history;
1423 @history = ();
1424 $load_node->(@{shift @future});
1425 },
1426 );
1427
1537 if (@history) { 1428 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1429 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1430 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1431 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1432 on_activate => sub {
1542 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1433 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(@{pop @history}); 1434 $load_node->(@{pop @history});
1544 }, 1435 },
1545 ); 1436 );
1546 } 1437 }
1547 1438
1548 if (@future) { 1439 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1440 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1441 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1442 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1443 on_activate => sub {
1553 push @history, [$curnode, $viewer->current_paragraph]; 1444 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(@{shift @future}); 1445 $load_node->(@{shift @future});
1555 }, 1446 },
1556 ); 1447 );
… …
1587 $CFPlus::Pod::goto_document = sub { 1478 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1479 my (@path) = @_;
1589 1480
1590 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1481 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1482
1592 $load_node->(CFPlus::Pod::find @path); 1483 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1484 $win->show;
1594 }; 1485 };
1595 1486
1596 $win 1487 $win
1488}
1489
1490sub open_string_query {
1491 my ($title, $cb, $txt, $tooltip) = @_;
1492 my $dialog = new CFPlus::UI::Toplevel
1493 x => "center",
1494 y => "center",
1495 z => 50,
1496 force_w => $WIDTH * 4/5,
1497 title => $title;
1498
1499 $dialog->add (
1500 my $e = new CFPlus::UI::Entry
1501 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1502 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1503 tooltip => $tooltip
1504 );
1505
1506 $e->grab_focus;
1507 $e->set_text ($txt) if $txt;
1508 $dialog->show;
1509}
1510
1511sub open_quit_dialog {
1512 unless ($QUIT_DIALOG) {
1513 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1514 x => "center",
1515 y => "center",
1516 z => 50,
1517 title => "Really Quit?",
1518 on_key_down => sub {
1519 my ($dialog, $ev) = @_;
1520 $ev->{sym} == 27 and $dialog->hide;
1521 }
1522 ;
1523
1524 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1525
1526 $vb->add (new CFPlus::UI::Label
1527 text => "You should find a savebed and apply it first!",
1528 max_w => $WIDTH * 0.25,
1529 ellipsize => 0,
1530 );
1531 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1532 $hb->add (new CFPlus::UI::Button
1533 text => "Ok",
1534 expand => 1,
1535 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1536 );
1537 $hb->add (new CFPlus::UI::Button
1538 text => "Quit anyway",
1539 expand => 1,
1540 on_activate => sub { exit },
1541 );
1542 }
1543
1544 $QUIT_DIALOG->show;
1545 $QUIT_DIALOG->grab_focus;
1546}
1547
1548sub show_tip_of_the_day {
1549 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1553 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1555
1556 # create dialog
1557 my $dialog;
1558
1559 my $close = sub {
1560 $dialog->destroy;
1561 };
1562
1563 $dialog = new CFPlus::UI::Toplevel
1564 x => "center",
1565 y => "center",
1566 z => 3,
1567 name => 'tip_of_the_day',
1568 force_w => int $WIDTH * 4/9,
1569 force_h => int $WIDTH * 2/9,
1570 title => "Tip of the day #" . (1 + $todindex),
1571 child => my $vbox = new CFPlus::UI::VBox,
1572 has_close_button => 1,
1573 on_delete => $close,
1574 ;
1575
1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1579
1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1581
1582 $table->add (0, 0, new CFPlus::UI::Button
1583 text => "Close",
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>.",
1585 on_activate => $close,
1586 );
1587
1588 $table->add (2, 0, new CFPlus::UI::Button
1589 text => "Next",
1590 tooltip => "Show the next <b>Tip of the day</b>.",
1591 on_activate => sub {
1592 $close->();
1593 &show_tip_of_the_day;
1594 },
1595 );
1596
1597 $dialog->show;
1597} 1598}
1598 1599
1599sub sdl_init { 1600sub sdl_init {
1600 CFPlus::SDL_Init 1601 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1602 and die "SDL::Init failed!\n";
… …
1635 padding => 0, 1636 padding => 0,
1636 z => 100, 1637 z => 100,
1637 force_x => "max", 1638 force_x => "max",
1638 force_y => 0; 1639 force_y => 0;
1639 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1640
1641 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1642 1641
1643 $STATUSBOX = new CFPlus::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1644 $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]);
1645 1644
1646 (new CFPlus::UI::Frame 1645 (new CFPlus::UI::Frame
… …
1747 ); 1746 );
1748 1747
1749 $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,
1750 tooltip => "View Documentation"); 1749 tooltip => "View Documentation");
1751 1750
1751
1752 $BUTTONBAR->add (new CFPlus::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1753 text => "Quit", 1753 text => "Quit",
1754 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1755 on_activate => sub { 1755 on_activate => sub {
1756 if ($CONN) { 1756 if ($CONN) {
… …
1767 } 1767 }
1768 1768
1769 $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]);
1770} 1770}
1771 1771
1772sub setup_build_button {
1773 my ($enabled) = @_;
1774 if ($enabled) {
1775 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1776 $BUILD_BUTTON ||= new CFPlus::UI::Button
1777 text => "Build",
1778 tooltip => "Opens the ingame builder",
1779 on_activate => sub {
1780 if ($CONN) {
1781 $CONN->send_ext_req (builder_player_items => sub {
1782 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1783 });
1784 }
1785 0
1786 };
1787 $BUTTONBAR->add ($BUILD_BUTTON);
1788 } else {
1789 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1790 }
1791}
1792
1793sub open_ingame_editor {
1794 my ($msg) = @_;
1795
1796 my $win = new CFPlus::UI::Toplevel
1797 x => 0,
1798 y => 'center',
1799 z => 4,
1800 name => 'builder_window',
1801 force_w => int $WIDTH * 1/4,
1802 force_h => int $HEIGHT * 3/4,
1803 title => "In game builder",
1804 has_close_button => 1;
1805
1806 my $r = new CFPlus::UI::ScrolledWindow (
1807 expand => 1,
1808 scroll_y => 1
1809 );
1810 $r->add (my $vb = new CFPlus::UI::VBox);
1811 $win->add ($r);
1812
1813
1814 $vb->add (
1815 new CFPlus::UI::Button
1816 text => "Disable build mode",
1817 on_activate => sub { $::IN_BUILD_MODE = undef }
1818 );
1819 $vb->add (
1820 new CFPlus::UI::Button
1821 text => "ERASE",
1822 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1823 );
1824
1825 for my $itemarchname (
1826 sort {
1827 $msg->{items}->{$a}->{build_arch_name}
1828 cmp $msg->{items}->{$b}->{build_arch_name}
1829 } keys %{$msg->{items}}
1830 ) {
1831 my $info = $msg->{items}->{$itemarchname};
1832 $vb->add (
1833 new CFPlus::UI::Button text => $info->{build_arch_name},
1834 on_activate => sub {
1835 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1836
1837 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1838 build_mode_query_arch_info ();
1839 }
1840 }
1841 );
1842 }
1843
1844 $win->show;
1845}
1846
1847sub build_mode_query_arch_info {
1848 my ($iteminfo) = $::IN_BUILD_MODE;
1849 my $itemarchname = $iteminfo->{item};
1850 my $info = $iteminfo->{info};
1851
1852 my $dialog = new CFPlus::UI::Toplevel
1853 x => "center",
1854 y => "center",
1855 z => 50,
1856 force_w => int $WIDTH * 1/2,
1857 title => "Enter information for placement of '$itemarchname'",
1858 has_close_button => 1;
1859
1860 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1861
1862 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1863 my $row = 0;
1864 if ($info->{has_name}) {
1865 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1866 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1867 }
1868 if ($info->{has_text}) {
1869 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1870 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1871 }
1872 if ($info->{has_connection}) {
1873 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1874 $table->add (1, $row++,
1875 new CFPlus::UI::Entry
1876 expand => 1,
1877 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1878 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1879 );
1880 }
1881
1882 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1883 $hb->add (new CFPlus::UI::Button
1884 text => "Close",
1885 expand => 1,
1886 on_activate => sub { $dialog->hide; 0 },
1887 );
1888 $dialog->show;
1889}
1890
1772sub video_shutdown { 1891sub video_shutdown {
1773 CFPlus::OpenGL::shutdown; 1892 CFPlus::OpenGL::shutdown;
1774 1893
1775 undef $SDL_ACTIVE; 1894 undef $SDL_ACTIVE;
1776} 1895}
… …
1807 CFPlus::Mix_AllocateChannels 8; 1926 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1927 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 1928
1810 audio_music_finished; 1929 audio_music_finished;
1811 1930
1931 local $_;
1812 while (<$fh>) { 1932 while (<$fh>) {
1813 next if /^\s*#/; 1933 next if /^\s*#/;
1814 next if /^\s*$/; 1934 next if /^\s*$/;
1815 1935
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 1936 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1901 }, 2021 },
1902 CFPlus::SDL_VIDEOEXPOSE => sub { 2022 CFPlus::SDL_VIDEOEXPOSE => sub {
1903 CFPlus::UI::full_refresh; 2023 CFPlus::UI::full_refresh;
1904 }, 2024 },
1905 CFPlus::SDL_ACTIVEEVENT => sub { 2025 CFPlus::SDL_ACTIVEEVENT => sub {
1906# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2026# not useful, as APPACTIVE include sonly iconified state, not unmapped
2027# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2028# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2029# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2030# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1907 }, 2031 },
1908 CFPlus::SDL_KEYDOWN => sub { 2032 CFPlus::SDL_KEYDOWN => sub {
1909 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2033 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1910 # alt-enter 2034 # alt-enter
1911 $FULLSCREEN_ENABLE->toggle; 2035 $FULLSCREEN_ENABLE->toggle;
… …
1950 log_fontsize => 0.7, 2074 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2075 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2076 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2077 stat_fontsize => 0.7,
1954 mapsize => 100, 2078 mapsize => 100,
1955 say_command => 'say', 2079 say_command => 'chat',
1956 audio_enable => 1, 2080 audio_enable => 1,
1957 bgm_enable => 1, 2081 bgm_enable => 1,
1958 bgm_volume => 0.25, 2082 bgm_volume => 0.25,
1959 face_prefetch => 0, 2083 face_prefetch => 0,
1960 output_sync => 1, 2084 output_sync => 1,
1961 output_count => 1, 2085 output_count => 1,
1962 pickup => 0, 2086 pickup => 0,
1963 inv_sort => "mtime", 2087 inv_sort => "mtime",
1964 default => "profile", # default profile 2088 default => "profile", # default profile
2089 show_tips => 1,
1965 ); 2090 );
1966 2091
1967 while (my ($k, $v) = each %DEF_CFG) { 2092 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2093 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2094 }
1970 2095
1971 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2096 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2097 $PROFILE = $CFG->{profile}{default};
2098
2099 # convert old bindings (only default profile matters)
2100 if (my $bindings = delete $PROFILE->{bindings}) {
2101 while (my ($mod, $syms) = each %$bindings) {
2102 while (my ($sym, $cmds) = each %$syms) {
2103 push @{ $PROFILE->{macro} }, {
2104 accelkey => [$mod*1, $sym*1],
2105 action => $cmds,
2106 };
2107 }
2108 }
2109 }
1972 2110
1973 sdl_init; 2111 sdl_init;
1974 2112
1975 @SDL_MODES = reverse 2113 @SDL_MODES = reverse
1976 grep $_->[0] >= 640 && $_->[1] >= 480, 2114 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2013# } 2151# }
2014# my $t2 = Time::HiRes::time; 2152# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2153# warn $t2-$t1;
2016# } 2154# }
2017 2155
2156 $startup_done->();
2157
2018 video_init; 2158 video_init;
2019 audio_init; 2159 audio_init;
2020} 2160}
2161
2162show_tip_of_the_day if $CFG->{show_tips};
2021 2163
2022Event::loop; 2164Event::loop;
2023#CFPlus::SDL_Quit; 2165#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2166#CFPlus::_exit 0;
2025 2167

Diff Legend

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