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.118 by root, Tue Aug 22 06:37:30 2006 UTC vs.
Revision 1.129 by root, Sun Nov 19 00:07:51 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;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
… …
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
… …
47 68
48$Event::Eval = 0; 69$Event::Eval = 0;
49$Event::DIED = sub { 70$Event::DIED = sub {
50 # TODO: display dialog box or so 71 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 72 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1]; 73 return;#d#
74 CFPlus::fatal ($_[1]);
53}; 75};
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.9';
65 76
66my $MAX_FPS = 60; 77my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
68 79
69our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 81
71our $LAST_REFRESH; 82our $LAST_REFRESH;
72our $NOW; 83our $NOW;
73 84
74our $CFG; 85our $CFG;
75our $CONN; 86our $CONN;
87our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 88our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 89
78our $WANT_REFRESH; 90our $WANT_REFRESH;
79our $CAN_REFRESH; 91our $CAN_REFRESH;
80 92
… …
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 157}
146 158
147sub debug { 159sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 160 $DEBUG_STATUS->set_text ($_[0]);
161}
162
163sub message {
164 my ($para) = @_;
165
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
149} 172}
150 173
151sub destroy_query_dialog { 174sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 175 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 176 if $_[0]{query_dialog};
… …
352 status "logging in..."; 375 status "logging in...";
353 376
354 $LOGIN_BUTTON->set_text ("Logout"); 377 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 378 $SETUP_DIALOG->hide;
356 379
380 $PROFILE = $CFG->{profile}{default};
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,
371 396
372 client => "cfplus $VERSION $] $^O", 397 client => "cfplus $CFPlus::VERSION $] $^O",
373 398
374 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
375 logview => $LOGVIEW, 400 logview => $LOGVIEW,
376 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
377 map => $MAP, 402 map => $MAP,
… …
832 857
833 my $table = $METASERVER->{table}; 858 my $table = $METASERVER->{table};
834 $table->clear; 859 $table->clear;
835 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
836 861
837 my $buf; 862 my $ok = 0;
838 863
839 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 864 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent;
840 866
841 unless ($fh) { 867 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
842 $label->set_text ("unable to contact metaserver: $!"); 868 } sub {
843 return; 869 my ($msg) = @_;
844 } 870 if ($msg) {
845
846 Event->io (fd => $fh, poll => 'r', cb => sub {
847 my $res = sysread $fh, $buf, 8192, length $buf;
848
849 if (!defined $res) {
850 $_[0]->w->cancel;
851 $label->set_text ("error while retrieving server list: $!");
852 } elsif ($res == 0) {
853 $_[0]->w->cancel;
854 status "server list retrieved";
855
856 utf8::decode $buf if utf8::valid $buf;
857
858 $table->clear; 871 $table->clear;
859 872
860 my @tip = ( 873 my @tip = (
861 "The current number of users logged in on the server.", 874 "The current number of users logged in on the server.",
862 "The hostname of the server.", 875 "The hostname of the server.",
… …
872 for 0 .. $#col; 885 for 0 .. $#col;
873 886
874 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
875 888
876 my $y = 0; 889 my $y = 0;
877 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} }
896 ) {
878 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
879 899
880 for ($desc) { 900 for ($desc) {
881 s/<br>/\n/gi; 901 s/<br>/\n/gi;
882 s/<li>/\n· /gi; 902 s/<li>/\n· /gi;
883 s/<.*?>//sgi; 903 s/<.*?>//sgi;
884 s/&/&amp;/g; 904 s/&amp;/&/g;
885 s/</&lt;/g; 905 s/&lt;/</g;
886 s/>/&gt;/g; 906 s/&gt;/>/g;
887 } 907 }
888 908
889 $uptime = sprintf "%dd %02d:%02d:%02d", 909 $uptime = sprintf "%dd %02d:%02d:%02d",
890 (int $m->[8] / 86400), 910 (int $uptime / 86400),
891 (int $m->[8] / 3600) % 24, 911 (int $uptime / 3600) % 24,
892 (int $m->[8] / 60) % 60, 912 (int $uptime / 60) % 60,
893 $m->[8] % 60; 913 $uptime % 60;
894 914
895 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
896 916
897 $y++; 917 $y++;
898 918
… …
908 ), 928 ),
909 (new CFPlus::UI::Empty expand => 1), 929 (new CFPlus::UI::Empty expand => 1),
910 ]); 930 ]);
911 931
912 $table->add ($_, $y, new CFPlus::UI::Label 932 $table->add ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4,
913 ellipsise => 0, 934 ellipsise => 0,
914 align => $align[$_], 935 align => $align[$_],
915 text => $m->[$_], 936 text => $m->[$_],
916 tooltip => $tip[$_], 937 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
917 can_hover => 1, 939 can_hover => 1,
918 can_events => 1, 940 can_events => 1,
919 fontsize => 0.8) 941 fontsize => 0.8)
920 for 0 .. $#$m; 942 for 0 .. $#$m;
921 } 943 }
944 } else {
945 $ok or $label->set_text ("error while contacting metaserver");
922 } 946 }
923 }); 947 };
948
924} 949}
925 950
926sub metaserver_dialog { 951sub metaserver_dialog {
927 my $vbox = new CFPlus::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
928 my $table = new CFPlus::UI::Table; 953 my $table = new CFPlus::UI::Table;
… …
932 title => "Server List", 957 title => "Server List",
933 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
934 x => 'center', 959 x => 'center',
935 y => 'center', 960 y => 'center',
936 z => 3, 961 z => 3,
962 force_w => $::WIDTH * 0.9,
937 force_h => $::HEIGHT * 0.4, 963 force_h => $::HEIGHT * 0.7,
938 child => $vbox, 964 child => $vbox,
939 has_close_button => 1, 965 has_close_button => 1,
940 table => $table, 966 table => $table,
941 on_visibility_change => sub { 967 on_visibility_change => sub {
942 update_metaserver ($_[0]) if $_[1]; 968 update_metaserver ($_[0]) if $_[1];
… …
1045 }, 1071 },
1046 ); 1072 );
1047 1073
1048 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1049 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1050 text => $CFG->{say_command}, 1076 text => $CFG->{say_command},
1051 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. " 1077 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. "
1052 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1053 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1054 on_changed => sub { 1080 on_changed => sub {
1055 my ($self, $value) = @_; 1081 my ($self, $value) = @_;
1056 $CFG->{say_command} = $value; 1082 $CFG->{say_command} = $value;
1083 0
1084 }
1085 );
1086
1087 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips},
1090 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1091 on_changed => sub {
1092 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value;
1057 0 1094 0
1058 } 1095 }
1059 ); 1096 );
1060 1097
1061 $vbox->add (new CFPlus::UI::FancyFrame 1098 $vbox->add (new CFPlus::UI::FancyFrame
… …
1125 window => $window, 1162 window => $window,
1126 input => $input, 1163 input => $input,
1127 }; 1164 };
1128 1165
1129 $window 1166 $window
1130}
1131
1132sub open_string_query {
1133 my ($title, $cb, $txt, $tooltip) = @_;
1134 my $dialog = new CFPlus::UI::Toplevel
1135 x => "center",
1136 y => "center",
1137 z => 50,
1138 force_w => $WIDTH * 4/5,
1139 title => $title;
1140
1141 $dialog->add (
1142 my $e = new CFPlus::UI::Entry
1143 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1144 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1145 tooltip => $tooltip
1146 );
1147
1148 $e->grab_focus;
1149 $e->set_text ($txt) if $txt;
1150 $dialog->show;
1151}
1152
1153sub open_quit_dialog {
1154 unless ($QUIT_DIALOG) {
1155 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1156 x => "center",
1157 y => "center",
1158 z => 50,
1159 title => "Really Quit?",
1160 on_key_down => sub {
1161 my ($dialog, $ev) = @_;
1162 $ev->{sym} == 27 and $dialog->hide;
1163 }
1164 ;
1165
1166 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1167
1168 $vb->add (new CFPlus::UI::Label
1169 text => "You should find a savebed and apply it first!",
1170 max_w => $WIDTH * 0.25,
1171 ellipsize => 0,
1172 );
1173 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1174 $hb->add (new CFPlus::UI::Button
1175 text => "Ok",
1176 expand => 1,
1177 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1178 );
1179 $hb->add (new CFPlus::UI::Button
1180 text => "Quit anyway",
1181 expand => 1,
1182 on_activate => sub { exit },
1183 );
1184 }
1185
1186 $QUIT_DIALOG->show;
1187 $QUIT_DIALOG->grab_focus;
1188} 1167}
1189 1168
1190sub autopickup_setup { 1169sub autopickup_setup {
1191 my $table = new CFPlus::UI::Table; 1170 my $table = new CFPlus::UI::Table;
1192 1171
… …
1323 #TODO# update to weigh/maxweight 1302 #TODO# update to weigh/maxweight
1324 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1303 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1325 1304
1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1305 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1327 $sw1->add ($INV = new CFPlus::UI::Inventory); 1306 $sw1->add ($INV = new CFPlus::UI::Inventory);
1307 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1328 1308
1329 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1309 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1330 1310
1331 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1311 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1332 1312
… …
1401 1381
1402 my $refresh; 1382 my $refresh;
1403 $refresh = $BIND_UPD_CB = sub { 1383 $refresh = $BIND_UPD_CB = sub {
1404 $binding_list->clear (); 1384 $binding_list->clear ();
1405 1385
1386 return unless $PROFILE;
1387
1406 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1388 for my $mod (keys %{$PROFILE->{bindings}}) {
1407 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1389 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1408 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1390 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1409 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1391 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1410 1392
1411 my $lbl = join "; ", @$cmds; 1393 my $lbl = join "; ", @$cmds;
1412 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1394 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1413 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1395 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1414 $hb->add (new CFPlus::UI::Button 1396 $hb->add (new CFPlus::UI::Button
1415 text => "delete", 1397 text => "delete",
1416 tooltip => "Deletes the binding", 1398 tooltip => "Deletes the binding",
1417 on_activate => sub { 1399 on_activate => sub {
1418 $binding_list->remove ($hb); 1400 $binding_list->remove ($hb);
1419 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1401 delete $PROFILE->{bindings}{$mod}{$sym};
1420 0 1402 0
1421 }); 1403 });
1422 1404
1423 $hb->add (new CFPlus::UI::Button 1405 $hb->add (new CFPlus::UI::Button
1424 text => "edit", 1406 text => "edit",
1425 tooltip => "Edits the binding", 1407 tooltip => "Edits the binding",
1426 on_activate => sub { 1408 on_activate => sub {
1427 $::BIND_EDITOR->set_binding ( 1409 $::BIND_EDITOR->set_binding (
1428 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1410 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1429 sub { 1411 sub {
1430 my ($nmod, $nsym, $ncmds) = @_; 1412 my ($nmod, $nsym, $ncmds) = @_;
1431 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1413 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1432 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1414 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1433 $refresh->(); 1415 $refresh->();
… …
1511 1493
1512sub help_window { 1494sub help_window {
1513 my $win = new CFPlus::UI::Toplevel 1495 my $win = new CFPlus::UI::Toplevel
1514 x => 'center', 1496 x => 'center',
1515 y => 'center', 1497 y => 'center',
1516 z => 2, 1498 z => 4,
1517 name => 'doc_browser', 1499 name => 'doc_browser',
1518 force_w => int $WIDTH * 7/8, 1500 force_w => int $WIDTH * 7/8,
1519 force_h => int $HEIGHT * 7/8, 1501 force_h => int $HEIGHT * 7/8,
1520 title => "Help Browser", 1502 title => "Help Browser",
1521 has_close_button => 1; 1503 has_close_button => 1;
… …
1607 $load_node->((CFPlus::Pod::find @path)[0]); 1589 $load_node->((CFPlus::Pod::find @path)[0]);
1608 $win->show; 1590 $win->show;
1609 }; 1591 };
1610 1592
1611 $win 1593 $win
1594}
1595
1596sub open_string_query {
1597 my ($title, $cb, $txt, $tooltip) = @_;
1598 my $dialog = new CFPlus::UI::Toplevel
1599 x => "center",
1600 y => "center",
1601 z => 50,
1602 force_w => $WIDTH * 4/5,
1603 title => $title;
1604
1605 $dialog->add (
1606 my $e = new CFPlus::UI::Entry
1607 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1608 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1609 tooltip => $tooltip
1610 );
1611
1612 $e->grab_focus;
1613 $e->set_text ($txt) if $txt;
1614 $dialog->show;
1615}
1616
1617sub open_quit_dialog {
1618 unless ($QUIT_DIALOG) {
1619 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1620 x => "center",
1621 y => "center",
1622 z => 50,
1623 title => "Really Quit?",
1624 on_key_down => sub {
1625 my ($dialog, $ev) = @_;
1626 $ev->{sym} == 27 and $dialog->hide;
1627 }
1628 ;
1629
1630 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1631
1632 $vb->add (new CFPlus::UI::Label
1633 text => "You should find a savebed and apply it first!",
1634 max_w => $WIDTH * 0.25,
1635 ellipsize => 0,
1636 );
1637 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1638 $hb->add (new CFPlus::UI::Button
1639 text => "Ok",
1640 expand => 1,
1641 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1642 );
1643 $hb->add (new CFPlus::UI::Button
1644 text => "Quit anyway",
1645 expand => 1,
1646 on_activate => sub { exit },
1647 );
1648 }
1649
1650 $QUIT_DIALOG->show;
1651 $QUIT_DIALOG->grab_focus;
1652}
1653
1654sub show_tip_of_the_day {
1655 # find all tips
1656 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1657
1658 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1659 $todindex = 0 if $todindex >= @tod;
1660 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1661
1662 # create dialog
1663 my $dialog;
1664
1665 my $close = sub {
1666 $dialog->destroy;
1667 };
1668
1669 $dialog = new CFPlus::UI::Toplevel
1670 x => "center",
1671 y => "center",
1672 z => 3,
1673 name => 'tip_of_the_day',
1674 force_w => int $WIDTH * 4/9,
1675 force_h => int $WIDTH * 2/9,
1676 title => "Tip of the day #" . (1 + $todindex),
1677 child => my $vbox = new CFPlus::UI::VBox,
1678 has_close_button => 1,
1679 on_delete => $close,
1680 ;
1681
1682 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1683 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1684 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1685
1686 $vbox->add (my $table = new CFPlus::UI::Table);
1687
1688 $table->add (0, 0, new CFPlus::UI::Button
1689 text => "Close",
1690 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>.",
1691 on_activate => $close,
1692 );
1693
1694 $table->add (2, 0, new CFPlus::UI::Button
1695 text => "Next",
1696 tooltip => "Show the next <b>Tip of the day</b>.",
1697 on_activate => sub {
1698 $close->();
1699 &show_tip_of_the_day;
1700 },
1701 );
1702
1703 $dialog->show;
1612} 1704}
1613 1705
1614sub sdl_init { 1706sub sdl_init {
1615 CFPlus::SDL_Init 1707 CFPlus::SDL_Init
1616 and die "SDL::Init failed!\n"; 1708 and die "SDL::Init failed!\n";
… …
1822 CFPlus::Mix_AllocateChannels 8; 1914 CFPlus::Mix_AllocateChannels 8;
1823 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1915 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1824 1916
1825 audio_music_finished; 1917 audio_music_finished;
1826 1918
1919 local $_;
1827 while (<$fh>) { 1920 while (<$fh>) {
1921 last;
1828 next if /^\s*#/; 1922 next if /^\s*#/;
1829 next if /^\s*$/; 1923 next if /^\s*$/;
1830 1924
1831 my ($file, $volume, $event) = split /\s+/, $_, 3; 1925 my ($file, $volume, $event) = split /\s+/, $_, 3;
1832 1926
… …
1965 log_fontsize => 0.7, 2059 log_fontsize => 0.7,
1966 gauge_fontsize => 1, 2060 gauge_fontsize => 1,
1967 gauge_size => 0.35, 2061 gauge_size => 0.35,
1968 stat_fontsize => 0.7, 2062 stat_fontsize => 0.7,
1969 mapsize => 100, 2063 mapsize => 100,
1970 say_command => 'say', 2064 say_command => 'chat',
1971 audio_enable => 1, 2065 audio_enable => 1,
1972 bgm_enable => 1, 2066 bgm_enable => 1,
1973 bgm_volume => 0.25, 2067 bgm_volume => 0.25,
1974 face_prefetch => 0, 2068 face_prefetch => 0,
1975 output_sync => 1, 2069 output_sync => 1,
1976 output_count => 1, 2070 output_count => 1,
1977 pickup => 0, 2071 pickup => 0,
1978 inv_sort => "mtime", 2072 inv_sort => "mtime",
1979 default => "profile", # default profile 2073 default => "profile", # default profile
2074 show_tips => 1,
1980 ); 2075 );
1981 2076
1982 while (my ($k, $v) = each %DEF_CFG) { 2077 while (my ($k, $v) = each %DEF_CFG) {
1983 $CFG->{$k} = $v unless exists $CFG->{$k}; 2078 $CFG->{$k} = $v unless exists $CFG->{$k};
1984 } 2079 }
… …
2028# } 2123# }
2029# my $t2 = Time::HiRes::time; 2124# my $t2 = Time::HiRes::time;
2030# warn $t2-$t1; 2125# warn $t2-$t1;
2031# } 2126# }
2032 2127
2128 $startup_done->();
2129
2033 video_init; 2130 video_init;
2034 audio_init; 2131 audio_init;
2035} 2132}
2133
2134show_tip_of_the_day if $CFG->{show_tips};
2036 2135
2037Event::loop; 2136Event::loop;
2038#CFPlus::SDL_Quit; 2137#CFPlus::SDL_Quit;
2039#CFPlus::_exit 0; 2138#CFPlus::_exit 0;
2040 2139

Diff Legend

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