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.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 68$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 69$SIG{PIPE} = 'IGNORE';
47 70
48$Event::Eval = 0; 71$Event::Eval = 0;
49$Event::DIED = sub { 72$Event::DIED = sub {
50 # TODO: display dialog box or so 73 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 74};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 75
66my $MAX_FPS = 60; 76my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
68 78
69our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 80
71our $LAST_REFRESH; 81our $LAST_REFRESH;
72our $NOW; 82our $NOW;
73 83
74our $CFG; 84our $CFG;
75our $CONN; 85our $CONN;
86our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 87our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 88
78our $WANT_REFRESH; 89our $WANT_REFRESH;
79our $CAN_REFRESH; 90our $CAN_REFRESH;
80 91
… …
111 122
112our $INVENTORY_PAGE; 123our $INVENTORY_PAGE;
113our $STATS_PAGE; 124our $STATS_PAGE;
114our $SKILL_PAGE; 125our $SKILL_PAGE;
115our $SPELL_PAGE; 126our $SPELL_PAGE;
127our $SPELL_LIST;
116 128
117our $HELP_WINDOW; 129our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 130our $MESSAGE_WINDOW;
119our $FLOORBOX; 131our $FLOORBOX;
120our $GAUGES; 132our $GAUGES;
… …
146 158
147sub debug { 159sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 160 $DEBUG_STATUS->set_text ($_[0]);
149} 161}
150 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;
172}
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};
154} 177}
155 178
156# server query dialog 179# server query dialog
157sub server_query { 180sub server_query {
158 my ($conn, $flags, $prompt) = @_; 181 my ($conn, $flags, $prompt) = @_;
159 182
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 184 x => "center",
162 y => "center", 185 y => "center",
163 title => "Server Query", 186 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 187 child => my $vbox = new CFPlus::UI::VBox,
165 ; 188 ;
… …
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,
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) {
… …
663 expand => 1, 691 expand => 1,
664 scroll_y => 1 692 scroll_y => 1
665 ); 693 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 694 $r->add (my $vb = new CFPlus::UI::VBox);
667 695
696 $vb->add (new CFPlus::UI::FancyFrame
697 label => "Player",
698 child => (my $pi = new CFPlus::UI::VBox),
699 );
700
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 701 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 702 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 703 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 704 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 705 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 706 tooltip => "The map you are currently on (if supported by the server).");
674 707
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 708 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 709 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 710 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 711 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 712 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 713 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 714 tooltip => "The weight limit: you cannot carry more than this.");
682 715
716 $vb->add (new CFPlus::UI::FancyFrame
717 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 718 child => (my $hb = new CFPlus::UI::HBox expand => 1),
719 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 720 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 721
686 my $color2 = [1, 1, 0]; 722 my $color2 = [1, 1, 0];
687 723
688 for ( 724 for (
… …
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 745 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 746 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 747 align => -1, text => $label, tooltip => "#stat_$label");
712 } 748 }
713 749
750 $vb->add (new CFPlus::UI::FancyFrame
751 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 752 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
753 );
715 754
716 my $row = 0; 755 my $row = 0;
717 my $col = 0; 756 my $col = 0;
718 757
719 my %resist_names = ( 758 my %resist_names = (
… …
819 858
820 my $table = $METASERVER->{table}; 859 my $table = $METASERVER->{table};
821 $table->clear; 860 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 861 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 862
824 my $buf; 863 my $ok = 0;
825 864
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 865 CFPlus::background {
866 my $ua = CFPlus::lwp_useragent;
827 867
828 unless ($fh) { 868 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 869 } sub {
830 return; 870 my ($msg) = @_;
831 } 871 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 872 $table->clear;
846 873
847 my @tip = ( 874 my @tip = (
848 "The current number of users logged in on the server.", 875 "The current number of users logged in on the server.",
849 "The hostname of the server.", 876 "The hostname of the server.",
… …
859 for 0 .. $#col; 886 for 0 .. $#col;
860 887
861 my @align = qw(1 0 1 1 -1); 888 my @align = qw(1 0 1 1 -1);
862 889
863 my $y = 0; 890 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} }
897 ) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
866 900
867 for ($desc) { 901 for ($desc) {
868 s/<br>/\n/gi; 902 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 903 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 904 s/<.*?>//sgi;
871 s/&/&amp;/g; 905 s/&amp;/&/g;
872 s/</&lt;/g; 906 s/&lt;/</g;
873 s/>/&gt;/g; 907 s/&gt;/>/g;
874 } 908 }
875 909
876 $uptime = sprintf "%dd %02d:%02d:%02d", 910 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 911 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 912 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 913 (int $uptime / 60) % 60,
880 $m->[8] % 60; 914 $uptime % 60;
881 915
882 $m = [$users, $host, $uptime, $version, $desc]; 916 $m = [$users, $host, $uptime, $version, $desc];
883 917
884 $y++; 918 $y++;
885 919
… …
895 ), 929 ),
896 (new CFPlus::UI::Empty expand => 1), 930 (new CFPlus::UI::Empty expand => 1),
897 ]); 931 ]);
898 932
899 $table->add ($_, $y, new CFPlus::UI::Label 933 $table->add ($_, $y, new CFPlus::UI::Label
934 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 935 ellipsise => 0,
901 align => $align[$_], 936 align => $align[$_],
902 text => $m->[$_], 937 text => $m->[$_],
903 tooltip => $tip[$_], 938 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 940 can_hover => 1,
905 can_events => 1, 941 can_events => 1,
906 fontsize => 0.8) 942 fontsize => 0.8)
907 for 0 .. $#$m; 943 for 0 .. $#$m;
908 } 944 }
945 } else {
946 $ok or $label->set_text ("error while contacting metaserver");
909 } 947 }
910 }); 948 };
949
911} 950}
912 951
913sub metaserver_dialog { 952sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 953 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 954 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 955 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 956
918 my $dialog = new CFPlus::UI::FancyFrame 957 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 958 title => "Server List",
920 name => 'metaserver_dialog', 959 name => 'metaserver_dialog',
921 x => 'center', 960 x => 'center',
922 y => 'center', 961 y => 'center',
923 z => 3, 962 z => 3,
963 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 964 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 965 child => $vbox,
926 has_close_button => 1, 966 has_close_button => 1,
927 table => $table, 967 table => $table,
928 on_visibility_change => sub { 968 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 969 update_metaserver ($_[0]) if $_[1];
… …
935} 975}
936 976
937sub server_setup { 977sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 978 my $vbox = new CFPlus::UI::VBox;
939 979
980 $vbox->add (new CFPlus::UI::FancyFrame
981 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 982 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
983 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 984 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 985
943 { 986 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 987 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 988
… …
1029 }, 1072 },
1030 ); 1073 );
1031 1074
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1075 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1076 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1077 text => $CFG->{say_command},
1035 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. " 1078 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. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1079 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1080 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1081 on_changed => sub {
1039 my ($self, $value) = @_; 1082 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1083 $CFG->{say_command} = $value;
1041 0 1084 0
1042 } 1085 }
1043 ); 1086 );
1044 1087
1088 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1089 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1090 state => $CFG->{show_tips},
1091 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1092 on_changed => sub {
1093 my ($self, $value) = @_;
1094 $CFG->{show_tips} = $value;
1095 0
1096 }
1097 );
1098
1045 $vbox->add (new CFPlus::UI::Label 1099 $vbox->add (new CFPlus::UI::FancyFrame
1046 text => "Server Info", 1100 label => "Server Info",
1047 fontsize => 1.2,
1048 padding_y => 8,
1049 fg => [1, 1, 0, 1],
1050 );
1051
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1101 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1102 );
1053 1103
1054 $vbox 1104 $vbox
1055} 1105}
1056 1106
1057sub message_window { 1107sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1108 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1109 name => "message_window",
1060 title => "Messages", 1110 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1111 border_bg => [1, 1, 1, 1],
1062 x => "max", 1112 x => "max",
1063 y => 0, 1113 y => 0,
… …
1113 window => $window, 1163 window => $window,
1114 input => $input, 1164 input => $input,
1115 }; 1165 };
1116 1166
1117 $window 1167 $window
1118}
1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174} 1168}
1175 1169
1176sub autopickup_setup { 1170sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table; 1171 my $table = new CFPlus::UI::Table;
1178 1172
… …
1196 ["Boots" => PICKUP_BOOTS], 1190 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1191 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1192 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1193 ],
1200 1194
1201 ["Readables", 2, 2, 1195 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1196 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1197 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1198 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1199 ],
1206 ["Misc", 2, 7, 1200 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1201 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1202 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1204 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1205 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1206 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1208 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1209 ["Jewelery" => PICKUP_JEWELS],
1210 ["Flesh" => PICKUP_FLESH],
1216 ], 1211 ],
1217 ["Weight/Value ratio", 2, 17] 1212 ["Weight/Value ratio", 2, 17]
1218 ) 1213 )
1219 { 1214 {
1220 my ($title, $x, $y, @bits) = @$_; 1215 my ($title, $x, $y, @bits) = @$_;
… …
1270 $table 1265 $table
1271} 1266}
1272 1267
1273my %SORT_ORDER = ( 1268my %SORT_ORDER = (
1274 type => undef, 1269 type => undef,
1275 mtime => sub { sort { 1270 mtime => sub {
1271 my $NOW = time;
1272 sort {
1273 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1274 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1275
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1277 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1278 or $a->{type} <=> $b->{type}
1279 } @_
1279 } @_ }, 1280 },
1280 weight => sub { sort { 1281 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1282 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1283 or $a->{type} <=> $b->{type}
1283 } @_ }, 1284 } @_ },
1284); 1285);
… …
1309 #TODO# update to weigh/maxweight 1310 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1311 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1312
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1313 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1314 $sw1->add ($INV = new CFPlus::UI::Inventory);
1315 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1316
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1317 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1318
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1319 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1320
… …
1335 $PL_WINDOW->show; 1337 $PL_WINDOW->show;
1336 } 1338 }
1337} 1339}
1338 1340
1339sub player_window { 1341sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1342 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1343 x => "center",
1342 y => "center", 1344 y => "center",
1343 force_w => $WIDTH * 9/10, 1345 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1346 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1347 title => "Player",
… …
1358 $ntb->add ( 1360 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1361 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1362 "Shows all your Skills."
1361 ); 1363 );
1362 1364
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1365 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1366 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1367 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1368 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1369 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1370 );
1369 $ntb->add ( 1371 $ntb->add (
… …
1387 1389
1388 my $refresh; 1390 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub { 1391 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear (); 1392 $binding_list->clear ();
1391 1393
1394 return unless $PROFILE;
1395
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1396 for my $mod (keys %{$PROFILE->{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1397 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1398 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1399 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396 1400
1397 my $lbl = join "; ", @$cmds; 1401 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1402 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1403 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button 1404 $hb->add (new CFPlus::UI::Button
1401 text => "delete", 1405 text => "delete",
1402 tooltip => "Deletes the binding", 1406 tooltip => "Deletes the binding",
1403 on_activate => sub { 1407 on_activate => sub {
1404 $binding_list->remove ($hb); 1408 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1409 delete $PROFILE->{bindings}{$mod}{$sym};
1406 0 1410 0
1407 }); 1411 });
1408 1412
1409 $hb->add (new CFPlus::UI::Button 1413 $hb->add (new CFPlus::UI::Button
1410 text => "edit", 1414 text => "edit",
1411 tooltip => "Edits the binding", 1415 tooltip => "Edits the binding",
1412 on_activate => sub { 1416 on_activate => sub {
1413 $::BIND_EDITOR->set_binding ( 1417 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1418 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1415 sub { 1419 sub {
1416 my ($nmod, $nsym, $ncmds) = @_; 1420 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1421 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1422 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->(); 1423 $refresh->();
… …
1434 } 1438 }
1435 } 1439 }
1436 }; 1440 };
1437 1441
1438 my $vb = new CFPlus::UI::VBox; 1442 my $vb = new CFPlus::UI::VBox;
1443 $vb->add (new CFPlus::UI::FancyFrame
1444 label => "Options",
1439 $vb->add (my $hb = new CFPlus::UI::HBox); 1445 child => (my $hb = new CFPlus::UI::HBox),
1446 );
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1447 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox 1448 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1, 1449 expand => 1,
1443 state => $CFG->{shift_fire_stop}, 1450 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1451 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1446 my ($cbox, $value) = @_; 1453 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value; 1454 $CFG->{shift_fire_stop} = $value;
1448 0 1455 0
1449 }); 1456 });
1450 1457
1451 $vb->add ($binding_list); 1458 $vb->add (new CFPlus::UI::FancyFrame
1459 label => "Bindings",
1460 child => $binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox); 1461 $vb->add (my $hb = new CFPlus::UI::HBox);
1453 1462
1454 $hb->add (new CFPlus::UI::Button 1463 $hb->add (new CFPlus::UI::Button
1455 text => "record new", 1464 text => "record new",
1456 expand => 1, 1465 expand => 1,
… …
1489 1498
1490 $vb 1499 $vb
1491} 1500}
1492 1501
1493sub help_window { 1502sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1503 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1504 x => 'center',
1496 y => 'center', 1505 y => 'center',
1497 z => 2, 1506 z => 4,
1498 name => 'doc_browser', 1507 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1508 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1509 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1510 title => "Help Browser",
1502 has_close_button => 1; 1511 has_close_button => 1;
1503 1512
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1513 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1514
1515 $vbox->add (new CFPlus::UI::FancyFrame
1516 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1517 child => (my $buttons = new CFPlus::UI::HBox),
1518 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1519 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1520 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1521
1510 my @history; 1522 my @history;
1511 my @future; 1523 my @future;
1512 my $curnode; 1524 my $curnode;
1513 1525
1514 my $load_node; $load_node = sub { 1526 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1527 my ($node, $para) = @_;
1516 1528
1517 $buttons->clear; 1529 $buttons->clear;
1530
1531 $buttons->add (new CFPlus::UI::Button
1532 text => "⇤",
1533 tooltip => "back to the starting page",
1534 on_activate => sub {
1535 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1536 unshift @future, @history;
1537 @history = ();
1538 $load_node->(@{shift @future});
1539 },
1540 );
1518 1541
1519 if (@history) { 1542 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1543 $buttons->add (new CFPlus::UI::Button
1521 text => "<", 1544 text => "⋘",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1], 1545 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1546 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1547 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1548 $load_node->(@{pop @history});
1549 },
1526 }); 1550 );
1527 } 1551 }
1528 1552
1529 if (@future) { 1553 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button 1554 $buttons->add (new CFPlus::UI::Button
1531 text => ">", 1555 text => "⋙",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0], 1556 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1533 on_activate => sub { 1557 on_activate => sub {
1534 push @history, $curnode; 1558 push @history, [$curnode, $viewer->current_paragraph];
1535 $load_node->(shift @future); 1559 $load_node->(@{shift @future});
1560 },
1536 }); 1561 );
1537 } 1562 }
1563
1564 $buttons->add (new CFPlus::UI::Label text => " ");
1565
1566 my @path = CFPlus::Pod::full_path_of $node;
1567 pop @path; # drop current node
1568
1569 for my $node (@path) {
1570 $buttons->add (new CFPlus::UI::Button
1571 text => $node->{kw}[0],
1572 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1573 on_activate => sub {
1574 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1575 $load_node->($node);
1576 },
1577 );
1578 $buttons->add (new CFPlus::UI::Label text => "/");
1579 }
1580
1581 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1538 1582
1539 $curnode = $node; 1583 $curnode = $node;
1540 1584
1541 $viewer->clear; 1585 $viewer->clear;
1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1586 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1543 $viewer->set_offset (0); 1587 $viewer->scroll_to ($para);
1544 }; 1588 };
1545 1589
1546 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1590 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547 1591
1548 $CFPlus::Pod::on_link = sub { 1592 $CFPlus::Pod::goto_document = sub {
1549 my (@path) = @_; 1593 my (@path) = @_;
1550 1594
1551 push @history, $curnode if $curnode; 1595 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 @future = ();
1553 1596
1554 $load_node->(CFPlus::Pod::find @path); 1597 $load_node->((CFPlus::Pod::find @path)[0]);
1555 $win->show; 1598 $win->show;
1556 }; 1599 };
1557 1600
1558 $win 1601 $win
1602}
1603
1604sub open_string_query {
1605 my ($title, $cb, $txt, $tooltip) = @_;
1606 my $dialog = new CFPlus::UI::Toplevel
1607 x => "center",
1608 y => "center",
1609 z => 50,
1610 force_w => $WIDTH * 4/5,
1611 title => $title;
1612
1613 $dialog->add (
1614 my $e = new CFPlus::UI::Entry
1615 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1616 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1617 tooltip => $tooltip
1618 );
1619
1620 $e->grab_focus;
1621 $e->set_text ($txt) if $txt;
1622 $dialog->show;
1623}
1624
1625sub open_quit_dialog {
1626 unless ($QUIT_DIALOG) {
1627 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1628 x => "center",
1629 y => "center",
1630 z => 50,
1631 title => "Really Quit?",
1632 on_key_down => sub {
1633 my ($dialog, $ev) = @_;
1634 $ev->{sym} == 27 and $dialog->hide;
1635 }
1636 ;
1637
1638 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1639
1640 $vb->add (new CFPlus::UI::Label
1641 text => "You should find a savebed and apply it first!",
1642 max_w => $WIDTH * 0.25,
1643 ellipsize => 0,
1644 );
1645 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1646 $hb->add (new CFPlus::UI::Button
1647 text => "Ok",
1648 expand => 1,
1649 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1650 );
1651 $hb->add (new CFPlus::UI::Button
1652 text => "Quit anyway",
1653 expand => 1,
1654 on_activate => sub { exit },
1655 );
1656 }
1657
1658 $QUIT_DIALOG->show;
1659 $QUIT_DIALOG->grab_focus;
1660}
1661
1662sub show_tip_of_the_day {
1663 # find all tips
1664 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1665
1666 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1667 $todindex = 0 if $todindex >= @tod;
1668 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1669
1670 # create dialog
1671 my $dialog;
1672
1673 my $close = sub {
1674 $dialog->destroy;
1675 };
1676
1677 $dialog = new CFPlus::UI::Toplevel
1678 x => "center",
1679 y => "center",
1680 z => 3,
1681 name => 'tip_of_the_day',
1682 force_w => int $WIDTH * 4/9,
1683 force_h => int $WIDTH * 2/9,
1684 title => "Tip of the day #" . (1 + $todindex),
1685 child => my $vbox = new CFPlus::UI::VBox,
1686 has_close_button => 1,
1687 on_delete => $close,
1688 ;
1689
1690 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1691 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1692 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1693
1694 $vbox->add (my $table = new CFPlus::UI::Table);
1695
1696 $table->add (0, 0, new CFPlus::UI::Button
1697 text => "Close",
1698 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>.",
1699 on_activate => $close,
1700 );
1701
1702 $table->add (2, 0, new CFPlus::UI::Button
1703 text => "Next",
1704 tooltip => "Show the next <b>Tip of the day</b>.",
1705 on_activate => sub {
1706 $close->();
1707 &show_tip_of_the_day;
1708 },
1709 );
1710
1711 $dialog->show;
1559} 1712}
1560 1713
1561sub sdl_init { 1714sub sdl_init {
1562 CFPlus::SDL_Init 1715 CFPlus::SDL_Init
1563 and die "SDL::Init failed!\n"; 1716 and die "SDL::Init failed!\n";
… …
1610 force_x => 0, 1763 force_x => 0,
1611 force_y => "max", 1764 force_y => "max",
1612 child => $STATUSBOX, 1765 child => $STATUSBOX,
1613 )->show; 1766 )->show;
1614 1767
1615 CFPlus::UI::FancyFrame->new ( 1768 CFPlus::UI::Toplevel->new (
1616 title => "Map", 1769 title => "Map",
1617 name => "mapmap", 1770 name => "mapmap",
1618 x => 0, 1771 x => 0,
1619 y => $FONTSIZE + 8, 1772 y => $FONTSIZE + 8,
1620 border_bg => [1, 1, 1, 192/255], 1773 border_bg => [1, 1, 1, 192/255],
… …
1648 can_hover => 1, 1801 can_hover => 1,
1649 can_events => 1, 1802 can_events => 1,
1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1803 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1651 ; 1804 ;
1652 1805
1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1806 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1654 title => "Setup", 1807 title => "Setup",
1655 name => "setup_dialog", 1808 name => "setup_dialog",
1656 x => 'center', 1809 x => 'center',
1657 y => 'center', 1810 y => 'center',
1658 z => 2, 1811 z => 2,
… …
1769 CFPlus::Mix_AllocateChannels 8; 1922 CFPlus::Mix_AllocateChannels 8;
1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1923 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1771 1924
1772 audio_music_finished; 1925 audio_music_finished;
1773 1926
1927 local $_;
1774 while (<$fh>) { 1928 while (<$fh>) {
1775 next if /^\s*#/; 1929 next if /^\s*#/;
1776 next if /^\s*$/; 1930 next if /^\s*$/;
1777 1931
1778 my ($file, $volume, $event) = split /\s+/, $_, 3; 1932 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1912 log_fontsize => 0.7, 2066 log_fontsize => 0.7,
1913 gauge_fontsize => 1, 2067 gauge_fontsize => 1,
1914 gauge_size => 0.35, 2068 gauge_size => 0.35,
1915 stat_fontsize => 0.7, 2069 stat_fontsize => 0.7,
1916 mapsize => 100, 2070 mapsize => 100,
1917 say_command => 'say', 2071 say_command => 'chat',
1918 audio_enable => 1, 2072 audio_enable => 1,
1919 bgm_enable => 1, 2073 bgm_enable => 1,
1920 bgm_volume => 0.25, 2074 bgm_volume => 0.25,
1921 face_prefetch => 0, 2075 face_prefetch => 0,
1922 output_sync => 1, 2076 output_sync => 1,
1923 output_count => 1, 2077 output_count => 1,
1924 pickup => 0, 2078 pickup => 0,
1925 inv_sort => "mtime", 2079 inv_sort => "mtime",
1926 default => "profile", # default profile 2080 default => "profile", # default profile
2081 show_tips => 1,
1927 ); 2082 );
1928 2083
1929 while (my ($k, $v) = each %DEF_CFG) { 2084 while (my ($k, $v) = each %DEF_CFG) {
1930 $CFG->{$k} = $v unless exists $CFG->{$k}; 2085 $CFG->{$k} = $v unless exists $CFG->{$k};
1931 } 2086 }
… …
1975# } 2130# }
1976# my $t2 = Time::HiRes::time; 2131# my $t2 = Time::HiRes::time;
1977# warn $t2-$t1; 2132# warn $t2-$t1;
1978# } 2133# }
1979 2134
2135 $startup_done->();
2136
1980 video_init; 2137 video_init;
1981 audio_init; 2138 audio_init;
1982} 2139}
2140
2141show_tip_of_the_day if $CFG->{show_tips};
1983 2142
1984Event::loop; 2143Event::loop;
1985#CFPlus::SDL_Quit; 2144#CFPlus::SDL_Quit;
1986#CFPlus::_exit 0; 2145#CFPlus::_exit 0;
1987 2146

Diff Legend

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