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.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 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};
154} 179}
155 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
156# server query dialog 184# server query dialog
157sub server_query { 185sub server_query {
158 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 }
159 202
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 204 x => "center",
162 y => "center", 205 y => "center",
163 title => "Server Query", 206 title => "Server Query",
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
356 399
357 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;
358 401
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
360 403
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 404 $MAP = new CFPlus::Map;
362 405
363 $CONN = eval { 406 $CONN = eval {
364 new CFPlus::Protocol 407 new CFPlus::Protocol
365 host => $host, 408 host => $host,
366 port => $port || 13327, 409 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 410 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 411 pass => $PROFILE->{password},
369 mapw => $mapsize, 412 mapw => $mapsize,
370 maph => $mapsize, 413 maph => $mapsize,
414
415 client => "cfplus $CFPlus::VERSION $] $^O",
371 416
372 map_widget => $MAPWIDGET, 417 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 418 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 419 statusbox => $STATUSBOX,
375 map => $MAP, 420 map => $MAP,
… …
402sub stop_game { 447sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
408 453
409 return unless $CONN; 454 return unless $CONN;
410 455
411 status "connection closed"; 456 status "connection closed";
412 457
… …
639 $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 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 685 $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 }); 686 $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"); 687 $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 }); 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" } );
644 690
645 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);
646 692
647 for my $x (0..2) { 693 for my $x (0..2) {
648 for my $y (0 .. 2) { 694 for my $y (0 .. 2) {
… …
652 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 },
653 ); 699 );
654 } 700 }
655 } 701 }
656 702
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 704
658 $table 705 $table
659} 706}
660 707
661sub stats_window { 708sub stats_window {
… …
830 877
831 my $table = $METASERVER->{table}; 878 my $table = $METASERVER->{table};
832 $table->clear; 879 $table->clear;
833 $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...");
834 881
835 my $buf; 882 my $ok = 0;
836 883
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 884 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent;
838 886
839 unless ($fh) { 887 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 888 } sub {
841 return; 889 my ($msg) = @_;
842 } 890 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; 891 $table->clear;
857 892
858 my @tip = ( 893 my @tip = (
859 "The current number of users logged in on the server.", 894 "The current number of users logged in on the server.",
860 "The hostname of the server.", 895 "The hostname of the server.",
… …
870 for 0 .. $#col; 905 for 0 .. $#col;
871 906
872 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
873 908
874 my $y = 0; 909 my $y = 0;
875 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 ) {
876 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)};
877 919
878 for ($desc) { 920 for ($desc) {
879 s/<br>/\n/gi; 921 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 923 s/<.*?>//sgi;
882 s/&/&amp;/g; 924 s/&amp;/&/g;
883 s/</&lt;/g; 925 s/&lt;/</g;
884 s/>/&gt;/g; 926 s/&gt;/>/g;
885 } 927 }
886 928
887 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 930 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
891 $m->[8] % 60; 933 $uptime % 60;
892 934
893 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
894 936
895 $y++; 937 $y++;
896 938
… …
906 ), 948 ),
907 (new CFPlus::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
908 ]); 950 ]);
909 951
910 $table->add ($_, $y, new CFPlus::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 954 ellipsise => 0,
912 align => $align[$_], 955 align => $align[$_],
913 text => $m->[$_], 956 text => $m->[$_],
914 tooltip => $tip[$_], 957 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 959 can_hover => 1,
916 can_events => 1, 960 can_events => 1,
917 fontsize => 0.8) 961 fontsize => 0.8)
918 for 0 .. $#$m; 962 for 0 .. $#$m;
919 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
920 } 966 }
921 }); 967 };
968
922} 969}
923 970
924sub metaserver_dialog { 971sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 972 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 973 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 977 title => "Server List",
931 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
932 x => 'center', 979 x => 'center',
933 y => 'center', 980 y => 'center',
934 z => 3, 981 z => 3,
982 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 983 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 984 child => $vbox,
937 has_close_button => 1, 985 has_close_button => 1,
938 table => $table, 986 table => $table,
939 on_visibility_change => sub { 987 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
… …
1043 }, 1091 },
1044 ); 1092 );
1045 1093
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1094 $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 1095 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1096 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. " 1097 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. " 1098 . "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.", 1099 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub { 1100 on_changed => sub {
1053 my ($self, $value) = @_; 1101 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value; 1102 $CFG->{say_command} = $value;
1103 0
1104 }
1105 );
1106
1107 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1108 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1109 state => $CFG->{show_tips},
1110 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1111 on_changed => sub {
1112 my ($self, $value) = @_;
1113 $CFG->{show_tips} = $value;
1055 0 1114 0
1056 } 1115 }
1057 ); 1116 );
1058 1117
1059 $vbox->add (new CFPlus::UI::FancyFrame 1118 $vbox->add (new CFPlus::UI::FancyFrame
… …
1123 window => $window, 1182 window => $window,
1124 input => $input, 1183 input => $input,
1125 }; 1184 };
1126 1185
1127 $window 1186 $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} 1187}
1185 1188
1186sub autopickup_setup { 1189sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1190 my $table = new CFPlus::UI::Table;
1188 1191
… …
1206 ["Boots" => PICKUP_BOOTS], 1209 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1210 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1211 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1212 ],
1210 1213
1211 ["Readables", 2, 2, 1214 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1215 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1216 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1217 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1218 ],
1216 ["Misc", 2, 7, 1219 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1220 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1221 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1222 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1223 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1224 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1225 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1226 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1227 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1228 ["Jewelery" => PICKUP_JEWELS],
1229 ["Flesh" => PICKUP_FLESH],
1226 ], 1230 ],
1227 ["Weight/Value ratio", 2, 17] 1231 ["Weight/Value ratio", 2, 17]
1228 ) 1232 )
1229 { 1233 {
1230 my ($title, $x, $y, @bits) = @$_; 1234 my ($title, $x, $y, @bits) = @$_;
… …
1280 $table 1284 $table
1281} 1285}
1282 1286
1283my %SORT_ORDER = ( 1287my %SORT_ORDER = (
1284 type => undef, 1288 type => undef,
1285 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
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1295 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1296 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1297 or $a->{type} <=> $b->{type}
1298 } @_
1289 } @_ }, 1299 },
1290 weight => sub { sort { 1300 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1301 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1302 or $a->{type} <=> $b->{type}
1293 } @_ }, 1303 } @_ },
1294); 1304);
… …
1319 #TODO# update to weigh/maxweight 1329 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1330 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1331
1322 $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);
1323 $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}});
1324 1335
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1336 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1337
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1338 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1339
… …
1368 $ntb->add ( 1379 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1380 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1381 "Shows all your Skills."
1371 ); 1382 );
1372 1383
1373 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);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1385 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1386 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1387 "Spellbook (F4)" => $spellsw,
1377 "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."
1378 ); 1389 );
1379 $ntb->add ( 1390 $ntb->add (
… …
1386 1397
1387 $plwin->add ($ntb); 1398 $plwin->add ($ntb);
1388 $plwin 1399 $plwin
1389} 1400}
1390 1401
1391sub update_bindings {
1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1393}
1394
1395sub keyboard_setup { 1402sub keyboard_setup {
1396 my $binding_list = new CFPlus::UI::VBox; 1403 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} 1404}
1507 1405
1508sub help_window { 1406sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1407 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1408 x => 'center',
1511 y => 'center', 1409 y => 'center',
1512 z => 2, 1410 z => 4,
1513 name => 'doc_browser', 1411 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1412 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1413 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1414 title => "Help Browser",
1517 has_close_button => 1; 1415 has_close_button => 1;
… …
1532 my $load_node; $load_node = sub { 1430 my $load_node; $load_node = sub {
1533 my ($node, $para) = @_; 1431 my ($node, $para) = @_;
1534 1432
1535 $buttons->clear; 1433 $buttons->clear;
1536 1434
1435 $buttons->add (new CFPlus::UI::Button
1436 text => "⇤",
1437 tooltip => "back to the starting page",
1438 on_activate => sub {
1439 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1440 unshift @future, @history;
1441 @history = ();
1442 $load_node->(@{shift @future});
1443 },
1444 );
1445
1537 if (@history) { 1446 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1447 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1448 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1449 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1450 on_activate => sub {
1542 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1451 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(@{pop @history}); 1452 $load_node->(@{pop @history});
1544 }, 1453 },
1545 ); 1454 );
1546 } 1455 }
1547 1456
1548 if (@future) { 1457 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1458 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1459 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1460 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1461 on_activate => sub {
1553 push @history, [$curnode, $viewer->current_paragraph]; 1462 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(@{shift @future}); 1463 $load_node->(@{shift @future});
1555 }, 1464 },
1556 ); 1465 );
… …
1587 $CFPlus::Pod::goto_document = sub { 1496 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1497 my (@path) = @_;
1589 1498
1590 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1499 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1500
1592 $load_node->(CFPlus::Pod::find @path); 1501 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1502 $win->show;
1594 }; 1503 };
1595 1504
1596 $win 1505 $win
1506}
1507
1508sub open_string_query {
1509 my ($title, $cb, $txt, $tooltip) = @_;
1510 my $dialog = new CFPlus::UI::Toplevel
1511 x => "center",
1512 y => "center",
1513 z => 50,
1514 force_w => $WIDTH * 4/5,
1515 title => $title;
1516
1517 $dialog->add (
1518 my $e = new CFPlus::UI::Entry
1519 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1520 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1521 tooltip => $tooltip
1522 );
1523
1524 $e->grab_focus;
1525 $e->set_text ($txt) if $txt;
1526 $dialog->show;
1527}
1528
1529sub open_quit_dialog {
1530 unless ($QUIT_DIALOG) {
1531 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1532 x => "center",
1533 y => "center",
1534 z => 50,
1535 title => "Really Quit?",
1536 on_key_down => sub {
1537 my ($dialog, $ev) = @_;
1538 $ev->{sym} == 27 and $dialog->hide;
1539 }
1540 ;
1541
1542 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1543
1544 $vb->add (new CFPlus::UI::Label
1545 text => "You should find a savebed and apply it first!",
1546 max_w => $WIDTH * 0.25,
1547 ellipsize => 0,
1548 );
1549 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1550 $hb->add (new CFPlus::UI::Button
1551 text => "Ok",
1552 expand => 1,
1553 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1554 );
1555 $hb->add (new CFPlus::UI::Button
1556 text => "Quit anyway",
1557 expand => 1,
1558 on_activate => sub { exit },
1559 );
1560 }
1561
1562 $QUIT_DIALOG->show;
1563 $QUIT_DIALOG->grab_focus;
1564}
1565
1566sub show_tip_of_the_day {
1567 # find all tips
1568 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1569
1570 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1571 $todindex = 0 if $todindex >= @tod;
1572 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1573
1574 # create dialog
1575 my $dialog;
1576
1577 my $close = sub {
1578 $dialog->destroy;
1579 };
1580
1581 $dialog = new CFPlus::UI::Toplevel
1582 x => "center",
1583 y => "center",
1584 z => 3,
1585 name => 'tip_of_the_day',
1586 force_w => int $WIDTH * 4/9,
1587 force_h => int $WIDTH * 2/9,
1588 title => "Tip of the day #" . (1 + $todindex),
1589 child => my $vbox = new CFPlus::UI::VBox,
1590 has_close_button => 1,
1591 on_delete => $close,
1592 ;
1593
1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1597
1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1599
1600 $table->add (0, 0, new CFPlus::UI::Button
1601 text => "Close",
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>.",
1603 on_activate => $close,
1604 );
1605
1606 $table->add (2, 0, new CFPlus::UI::Button
1607 text => "Next",
1608 tooltip => "Show the next <b>Tip of the day</b>.",
1609 on_activate => sub {
1610 $close->();
1611 &show_tip_of_the_day;
1612 },
1613 );
1614
1615 $dialog->show;
1597} 1616}
1598 1617
1599sub sdl_init { 1618sub sdl_init {
1600 CFPlus::SDL_Init 1619 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1620 and die "SDL::Init failed!\n";
… …
1635 padding => 0, 1654 padding => 0,
1636 z => 100, 1655 z => 100,
1637 force_x => "max", 1656 force_x => "max",
1638 force_y => 0; 1657 force_y => 0;
1639 $DEBUG_STATUS->show; 1658 $DEBUG_STATUS->show;
1640
1641 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1642 1659
1643 $STATUSBOX = new CFPlus::UI::Statusbox; 1660 $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]); 1661 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1645 1662
1646 (new CFPlus::UI::Frame 1663 (new CFPlus::UI::Frame
… …
1747 ); 1764 );
1748 1765
1749 $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,
1750 tooltip => "View Documentation"); 1767 tooltip => "View Documentation");
1751 1768
1769
1752 $BUTTONBAR->add (new CFPlus::UI::Button 1770 $BUTTONBAR->add (new CFPlus::UI::Button
1753 text => "Quit", 1771 text => "Quit",
1754 tooltip => "Terminates the program", 1772 tooltip => "Terminates the program",
1755 on_activate => sub { 1773 on_activate => sub {
1756 if ($CONN) { 1774 if ($CONN) {
… …
1767 } 1785 }
1768 1786
1769 $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]);
1770} 1788}
1771 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
1772sub video_shutdown { 1909sub video_shutdown {
1773 CFPlus::OpenGL::shutdown; 1910 CFPlus::OpenGL::shutdown;
1774 1911
1775 undef $SDL_ACTIVE; 1912 undef $SDL_ACTIVE;
1776} 1913}
… …
1807 CFPlus::Mix_AllocateChannels 8; 1944 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1945 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 1946
1810 audio_music_finished; 1947 audio_music_finished;
1811 1948
1949 local $_;
1812 while (<$fh>) { 1950 while (<$fh>) {
1813 next if /^\s*#/; 1951 next if /^\s*#/;
1814 next if /^\s*$/; 1952 next if /^\s*$/;
1815 1953
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 1954 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1901 }, 2039 },
1902 CFPlus::SDL_VIDEOEXPOSE => sub { 2040 CFPlus::SDL_VIDEOEXPOSE => sub {
1903 CFPlus::UI::full_refresh; 2041 CFPlus::UI::full_refresh;
1904 }, 2042 },
1905 CFPlus::SDL_ACTIVEEVENT => sub { 2043 CFPlus::SDL_ACTIVEEVENT => sub {
1906# 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;
1907 }, 2049 },
1908 CFPlus::SDL_KEYDOWN => sub { 2050 CFPlus::SDL_KEYDOWN => sub {
1909 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2051 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1910 # alt-enter 2052 # alt-enter
1911 $FULLSCREEN_ENABLE->toggle; 2053 $FULLSCREEN_ENABLE->toggle;
… …
1950 log_fontsize => 0.7, 2092 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2093 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2094 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2095 stat_fontsize => 0.7,
1954 mapsize => 100, 2096 mapsize => 100,
1955 say_command => 'say', 2097 say_command => 'chat',
1956 audio_enable => 1, 2098 audio_enable => 1,
1957 bgm_enable => 1, 2099 bgm_enable => 1,
1958 bgm_volume => 0.25, 2100 bgm_volume => 0.25,
1959 face_prefetch => 0, 2101 face_prefetch => 0,
1960 output_sync => 1, 2102 output_sync => 1,
1961 output_count => 1, 2103 output_count => 1,
1962 pickup => 0, 2104 pickup => 0,
1963 inv_sort => "mtime", 2105 inv_sort => "mtime",
1964 default => "profile", # default profile 2106 default => "profile", # default profile
2107 show_tips => 1,
1965 ); 2108 );
1966 2109
1967 while (my ($k, $v) = each %DEF_CFG) { 2110 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2111 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2112 }
1970 2113
1971 $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 }
1972 2128
1973 sdl_init; 2129 sdl_init;
1974 2130
1975 @SDL_MODES = reverse 2131 @SDL_MODES = reverse
1976 grep $_->[0] >= 640 && $_->[1] >= 480, 2132 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2013# } 2169# }
2014# my $t2 = Time::HiRes::time; 2170# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2171# warn $t2-$t1;
2016# } 2172# }
2017 2173
2174 $startup_done->();
2175
2018 video_init; 2176 video_init;
2019 audio_init; 2177 audio_init;
2020} 2178}
2179
2180show_tip_of_the_day if $CFG->{show_tips};
2021 2181
2022Event::loop; 2182Event::loop;
2023#CFPlus::SDL_Quit; 2183#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2184#CFPlus::_exit 0;
2025 2185

Diff Legend

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