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.130 by root, Sun Nov 19 19:43:53 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.1';
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
… …
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,
… …
663 expand => 1, 690 expand => 1,
664 scroll_y => 1 691 scroll_y => 1
665 ); 692 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 693 $r->add (my $vb = new CFPlus::UI::VBox);
667 694
695 $vb->add (new CFPlus::UI::FancyFrame
696 label => "Player",
697 child => (my $pi = new CFPlus::UI::VBox),
698 );
699
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 700 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 701 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."); 702 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, 703 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 704 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 705 tooltip => "The map you are currently on (if supported by the server).");
674 706
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 707 $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, 708 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 710 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, 711 $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, 712 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 713 tooltip => "The weight limit: you cannot carry more than this.");
682 714
715 $vb->add (new CFPlus::UI::FancyFrame
716 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 717 child => (my $hb = new CFPlus::UI::HBox expand => 1),
718 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 719 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 720
686 my $color2 = [1, 1, 0]; 721 my $color2 = [1, 1, 0];
687 722
688 for ( 723 for (
… …
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 744 $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, 745 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 746 align => -1, text => $label, tooltip => "#stat_$label");
712 } 747 }
713 748
749 $vb->add (new CFPlus::UI::FancyFrame
750 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 751 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
752 );
715 753
716 my $row = 0; 754 my $row = 0;
717 my $col = 0; 755 my $col = 0;
718 756
719 my %resist_names = ( 757 my %resist_names = (
… …
819 857
820 my $table = $METASERVER->{table}; 858 my $table = $METASERVER->{table};
821 $table->clear; 859 $table->clear;
822 $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...");
823 861
824 my $buf; 862 my $ok = 0;
825 863
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 864 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent;
827 866
828 unless ($fh) { 867 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 868 } sub {
830 return; 869 my ($msg) = @_;
831 } 870 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; 871 $table->clear;
846 872
847 my @tip = ( 873 my @tip = (
848 "The current number of users logged in on the server.", 874 "The current number of users logged in on the server.",
849 "The hostname of the server.", 875 "The hostname of the server.",
… …
859 for 0 .. $#col; 885 for 0 .. $#col;
860 886
861 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
862 888
863 my $y = 0; 889 my $y = 0;
864 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 ) {
865 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)};
866 899
867 for ($desc) { 900 for ($desc) {
868 s/<br>/\n/gi; 901 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 902 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 903 s/<.*?>//sgi;
871 s/&/&amp;/g; 904 s/&amp;/&/g;
872 s/</&lt;/g; 905 s/&lt;/</g;
873 s/>/&gt;/g; 906 s/&gt;/>/g;
874 } 907 }
875 908
876 $uptime = sprintf "%dd %02d:%02d:%02d", 909 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 910 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 911 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 912 (int $uptime / 60) % 60,
880 $m->[8] % 60; 913 $uptime % 60;
881 914
882 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
883 916
884 $y++; 917 $y++;
885 918
… …
895 ), 928 ),
896 (new CFPlus::UI::Empty expand => 1), 929 (new CFPlus::UI::Empty expand => 1),
897 ]); 930 ]);
898 931
899 $table->add ($_, $y, new CFPlus::UI::Label 932 $table->add ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 934 ellipsise => 0,
901 align => $align[$_], 935 align => $align[$_],
902 text => $m->[$_], 936 text => $m->[$_],
903 tooltip => $tip[$_], 937 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 939 can_hover => 1,
905 can_events => 1, 940 can_events => 1,
906 fontsize => 0.8) 941 fontsize => 0.8)
907 for 0 .. $#$m; 942 for 0 .. $#$m;
908 } 943 }
944 } else {
945 $ok or $label->set_text ("error while contacting metaserver");
909 } 946 }
910 }); 947 };
948
911} 949}
912 950
913sub metaserver_dialog { 951sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 953 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 954 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 955
918 my $dialog = new CFPlus::UI::FancyFrame 956 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 957 title => "Server List",
920 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
921 x => 'center', 959 x => 'center',
922 y => 'center', 960 y => 'center',
923 z => 3, 961 z => 3,
962 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 963 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 964 child => $vbox,
926 has_close_button => 1, 965 has_close_button => 1,
927 table => $table, 966 table => $table,
928 on_visibility_change => sub { 967 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 968 update_metaserver ($_[0]) if $_[1];
… …
935} 974}
936 975
937sub server_setup { 976sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 977 my $vbox = new CFPlus::UI::VBox;
939 978
979 $vbox->add (new CFPlus::UI::FancyFrame
980 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 981 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
982 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 983 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 984
943 { 985 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 986 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 987
… …
1029 }, 1071 },
1030 ); 1072 );
1031 1073
1032 $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");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1076 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. " 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. "
1036 . "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. "
1037 . "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.",
1038 on_changed => sub { 1080 on_changed => sub {
1039 my ($self, $value) = @_; 1081 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1082 $CFG->{say_command} = $value;
1041 0 1083 0
1042 } 1084 }
1043 ); 1085 );
1044 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;
1094 0
1095 }
1096 );
1097
1045 $vbox->add (new CFPlus::UI::Label 1098 $vbox->add (new CFPlus::UI::FancyFrame
1046 text => "Server Info", 1099 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); 1100 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1101 );
1053 1102
1054 $vbox 1103 $vbox
1055} 1104}
1056 1105
1057sub message_window { 1106sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1107 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1108 name => "message_window",
1060 title => "Messages", 1109 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1110 border_bg => [1, 1, 1, 1],
1062 x => "max", 1111 x => "max",
1063 y => 0, 1112 y => 0,
… …
1113 window => $window, 1162 window => $window,
1114 input => $input, 1163 input => $input,
1115 }; 1164 };
1116 1165
1117 $window 1166 $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} 1167}
1175 1168
1176sub autopickup_setup { 1169sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table; 1170 my $table = new CFPlus::UI::Table;
1178 1171
… …
1270 $table 1263 $table
1271} 1264}
1272 1265
1273my %SORT_ORDER = ( 1266my %SORT_ORDER = (
1274 type => undef, 1267 type => undef,
1275 mtime => sub { sort { 1268 mtime => sub {
1269 my $NOW = time;
1270 sort {
1271 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1272 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1273
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1274 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1275 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1276 or $a->{type} <=> $b->{type}
1277 } @_
1279 } @_ }, 1278 },
1280 weight => sub { sort { 1279 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1280 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1281 or $a->{type} <=> $b->{type}
1283 } @_ }, 1282 } @_ },
1284); 1283);
… …
1309 #TODO# update to weigh/maxweight 1308 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1309 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1310
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1311 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1312 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1314
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1315 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1316
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1318
… …
1335 $PL_WINDOW->show; 1335 $PL_WINDOW->show;
1336 } 1336 }
1337} 1337}
1338 1338
1339sub player_window { 1339sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1340 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1341 x => "center",
1342 y => "center", 1342 y => "center",
1343 force_w => $WIDTH * 9/10, 1343 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1344 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1345 title => "Player",
… …
1387 1387
1388 my $refresh; 1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub { 1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear (); 1390 $binding_list->clear ();
1391 1391
1392 return unless $PROFILE;
1393
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1394 for my $mod (keys %{$PROFILE->{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1395 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1396 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1397 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396 1398
1397 my $lbl = join "; ", @$cmds; 1399 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1400 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1401 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button 1402 $hb->add (new CFPlus::UI::Button
1401 text => "delete", 1403 text => "delete",
1402 tooltip => "Deletes the binding", 1404 tooltip => "Deletes the binding",
1403 on_activate => sub { 1405 on_activate => sub {
1404 $binding_list->remove ($hb); 1406 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1407 delete $PROFILE->{bindings}{$mod}{$sym};
1406 0 1408 0
1407 }); 1409 });
1408 1410
1409 $hb->add (new CFPlus::UI::Button 1411 $hb->add (new CFPlus::UI::Button
1410 text => "edit", 1412 text => "edit",
1411 tooltip => "Edits the binding", 1413 tooltip => "Edits the binding",
1412 on_activate => sub { 1414 on_activate => sub {
1413 $::BIND_EDITOR->set_binding ( 1415 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1416 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1415 sub { 1417 sub {
1416 my ($nmod, $nsym, $ncmds) = @_; 1418 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1419 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1420 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->(); 1421 $refresh->();
… …
1434 } 1436 }
1435 } 1437 }
1436 }; 1438 };
1437 1439
1438 my $vb = new CFPlus::UI::VBox; 1440 my $vb = new CFPlus::UI::VBox;
1441 $vb->add (new CFPlus::UI::FancyFrame
1442 label => "Options",
1439 $vb->add (my $hb = new CFPlus::UI::HBox); 1443 child => (my $hb = new CFPlus::UI::HBox),
1444 );
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1445 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox 1446 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1, 1447 expand => 1,
1443 state => $CFG->{shift_fire_stop}, 1448 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1449 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1446 my ($cbox, $value) = @_; 1451 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value; 1452 $CFG->{shift_fire_stop} = $value;
1448 0 1453 0
1449 }); 1454 });
1450 1455
1451 $vb->add ($binding_list); 1456 $vb->add (new CFPlus::UI::FancyFrame
1457 label => "Bindings",
1458 child => $binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox); 1459 $vb->add (my $hb = new CFPlus::UI::HBox);
1453 1460
1454 $hb->add (new CFPlus::UI::Button 1461 $hb->add (new CFPlus::UI::Button
1455 text => "record new", 1462 text => "record new",
1456 expand => 1, 1463 expand => 1,
… …
1489 1496
1490 $vb 1497 $vb
1491} 1498}
1492 1499
1493sub help_window { 1500sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1501 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1502 x => 'center',
1496 y => 'center', 1503 y => 'center',
1497 z => 2, 1504 z => 4,
1498 name => 'doc_browser', 1505 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1506 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1507 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1508 title => "Help Browser",
1502 has_close_button => 1; 1509 has_close_button => 1;
1503 1510
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1511 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1512
1513 $vbox->add (new CFPlus::UI::FancyFrame
1514 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1515 child => (my $buttons = new CFPlus::UI::HBox),
1516 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1517 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1518 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1519
1510 my @history; 1520 my @history;
1511 my @future; 1521 my @future;
1512 my $curnode; 1522 my $curnode;
1513 1523
1514 my $load_node; $load_node = sub { 1524 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1525 my ($node, $para) = @_;
1516 1526
1517 $buttons->clear; 1527 $buttons->clear;
1528
1529 $buttons->add (new CFPlus::UI::Button
1530 text => "⇤",
1531 tooltip => "back to the starting page",
1532 on_activate => sub {
1533 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1534 unshift @future, @history;
1535 @history = ();
1536 $load_node->(@{shift @future});
1537 },
1538 );
1518 1539
1519 if (@history) { 1540 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1541 $buttons->add (new CFPlus::UI::Button
1521 text => "<", 1542 text => "⋘",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1], 1543 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1544 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1545 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1546 $load_node->(@{pop @history});
1547 },
1526 }); 1548 );
1527 } 1549 }
1528 1550
1529 if (@future) { 1551 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button 1552 $buttons->add (new CFPlus::UI::Button
1531 text => ">", 1553 text => "⋙",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0], 1554 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1533 on_activate => sub { 1555 on_activate => sub {
1534 push @history, $curnode; 1556 push @history, [$curnode, $viewer->current_paragraph];
1535 $load_node->(shift @future); 1557 $load_node->(@{shift @future});
1558 },
1536 }); 1559 );
1537 } 1560 }
1561
1562 $buttons->add (new CFPlus::UI::Label text => " ");
1563
1564 my @path = CFPlus::Pod::full_path_of $node;
1565 pop @path; # drop current node
1566
1567 for my $node (@path) {
1568 $buttons->add (new CFPlus::UI::Button
1569 text => $node->{kw}[0],
1570 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1571 on_activate => sub {
1572 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1573 $load_node->($node);
1574 },
1575 );
1576 $buttons->add (new CFPlus::UI::Label text => "/");
1577 }
1578
1579 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1538 1580
1539 $curnode = $node; 1581 $curnode = $node;
1540 1582
1541 $viewer->clear; 1583 $viewer->clear;
1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1584 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1543 $viewer->set_offset (0); 1585 $viewer->scroll_to ($para);
1544 }; 1586 };
1545 1587
1546 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1588 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547 1589
1548 $CFPlus::Pod::on_link = sub { 1590 $CFPlus::Pod::goto_document = sub {
1549 my (@path) = @_; 1591 my (@path) = @_;
1550 1592
1551 push @history, $curnode if $curnode; 1593 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 @future = ();
1553 1594
1554 $load_node->(CFPlus::Pod::find @path); 1595 $load_node->((CFPlus::Pod::find @path)[0]);
1555 $win->show; 1596 $win->show;
1556 }; 1597 };
1557 1598
1558 $win 1599 $win
1600}
1601
1602sub open_string_query {
1603 my ($title, $cb, $txt, $tooltip) = @_;
1604 my $dialog = new CFPlus::UI::Toplevel
1605 x => "center",
1606 y => "center",
1607 z => 50,
1608 force_w => $WIDTH * 4/5,
1609 title => $title;
1610
1611 $dialog->add (
1612 my $e = new CFPlus::UI::Entry
1613 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1614 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1615 tooltip => $tooltip
1616 );
1617
1618 $e->grab_focus;
1619 $e->set_text ($txt) if $txt;
1620 $dialog->show;
1621}
1622
1623sub open_quit_dialog {
1624 unless ($QUIT_DIALOG) {
1625 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1626 x => "center",
1627 y => "center",
1628 z => 50,
1629 title => "Really Quit?",
1630 on_key_down => sub {
1631 my ($dialog, $ev) = @_;
1632 $ev->{sym} == 27 and $dialog->hide;
1633 }
1634 ;
1635
1636 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1637
1638 $vb->add (new CFPlus::UI::Label
1639 text => "You should find a savebed and apply it first!",
1640 max_w => $WIDTH * 0.25,
1641 ellipsize => 0,
1642 );
1643 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1644 $hb->add (new CFPlus::UI::Button
1645 text => "Ok",
1646 expand => 1,
1647 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1648 );
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Quit anyway",
1651 expand => 1,
1652 on_activate => sub { exit },
1653 );
1654 }
1655
1656 $QUIT_DIALOG->show;
1657 $QUIT_DIALOG->grab_focus;
1658}
1659
1660sub show_tip_of_the_day {
1661 # find all tips
1662 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1663
1664 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1665 $todindex = 0 if $todindex >= @tod;
1666 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1667
1668 # create dialog
1669 my $dialog;
1670
1671 my $close = sub {
1672 $dialog->destroy;
1673 };
1674
1675 $dialog = new CFPlus::UI::Toplevel
1676 x => "center",
1677 y => "center",
1678 z => 3,
1679 name => 'tip_of_the_day',
1680 force_w => int $WIDTH * 4/9,
1681 force_h => int $WIDTH * 2/9,
1682 title => "Tip of the day #" . (1 + $todindex),
1683 child => my $vbox = new CFPlus::UI::VBox,
1684 has_close_button => 1,
1685 on_delete => $close,
1686 ;
1687
1688 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1691
1692 $vbox->add (my $table = new CFPlus::UI::Table);
1693
1694 $table->add (0, 0, new CFPlus::UI::Button
1695 text => "Close",
1696 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>.",
1697 on_activate => $close,
1698 );
1699
1700 $table->add (2, 0, new CFPlus::UI::Button
1701 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub {
1704 $close->();
1705 &show_tip_of_the_day;
1706 },
1707 );
1708
1709 $dialog->show;
1559} 1710}
1560 1711
1561sub sdl_init { 1712sub sdl_init {
1562 CFPlus::SDL_Init 1713 CFPlus::SDL_Init
1563 and die "SDL::Init failed!\n"; 1714 and die "SDL::Init failed!\n";
… …
1610 force_x => 0, 1761 force_x => 0,
1611 force_y => "max", 1762 force_y => "max",
1612 child => $STATUSBOX, 1763 child => $STATUSBOX,
1613 )->show; 1764 )->show;
1614 1765
1615 CFPlus::UI::FancyFrame->new ( 1766 CFPlus::UI::Toplevel->new (
1616 title => "Map", 1767 title => "Map",
1617 name => "mapmap", 1768 name => "mapmap",
1618 x => 0, 1769 x => 0,
1619 y => $FONTSIZE + 8, 1770 y => $FONTSIZE + 8,
1620 border_bg => [1, 1, 1, 192/255], 1771 border_bg => [1, 1, 1, 192/255],
… …
1648 can_hover => 1, 1799 can_hover => 1,
1649 can_events => 1, 1800 can_events => 1,
1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1801 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1651 ; 1802 ;
1652 1803
1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1804 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1654 title => "Setup", 1805 title => "Setup",
1655 name => "setup_dialog", 1806 name => "setup_dialog",
1656 x => 'center', 1807 x => 'center',
1657 y => 'center', 1808 y => 'center',
1658 z => 2, 1809 z => 2,
… …
1769 CFPlus::Mix_AllocateChannels 8; 1920 CFPlus::Mix_AllocateChannels 8;
1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1921 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1771 1922
1772 audio_music_finished; 1923 audio_music_finished;
1773 1924
1925 local $_;
1774 while (<$fh>) { 1926 while (<$fh>) {
1775 next if /^\s*#/; 1927 next if /^\s*#/;
1776 next if /^\s*$/; 1928 next if /^\s*$/;
1777 1929
1778 my ($file, $volume, $event) = split /\s+/, $_, 3; 1930 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1912 log_fontsize => 0.7, 2064 log_fontsize => 0.7,
1913 gauge_fontsize => 1, 2065 gauge_fontsize => 1,
1914 gauge_size => 0.35, 2066 gauge_size => 0.35,
1915 stat_fontsize => 0.7, 2067 stat_fontsize => 0.7,
1916 mapsize => 100, 2068 mapsize => 100,
1917 say_command => 'say', 2069 say_command => 'chat',
1918 audio_enable => 1, 2070 audio_enable => 1,
1919 bgm_enable => 1, 2071 bgm_enable => 1,
1920 bgm_volume => 0.25, 2072 bgm_volume => 0.25,
1921 face_prefetch => 0, 2073 face_prefetch => 0,
1922 output_sync => 1, 2074 output_sync => 1,
1923 output_count => 1, 2075 output_count => 1,
1924 pickup => 0, 2076 pickup => 0,
1925 inv_sort => "mtime", 2077 inv_sort => "mtime",
1926 default => "profile", # default profile 2078 default => "profile", # default profile
2079 show_tips => 1,
1927 ); 2080 );
1928 2081
1929 while (my ($k, $v) = each %DEF_CFG) { 2082 while (my ($k, $v) = each %DEF_CFG) {
1930 $CFG->{$k} = $v unless exists $CFG->{$k}; 2083 $CFG->{$k} = $v unless exists $CFG->{$k};
1931 } 2084 }
… …
1975# } 2128# }
1976# my $t2 = Time::HiRes::time; 2129# my $t2 = Time::HiRes::time;
1977# warn $t2-$t1; 2130# warn $t2-$t1;
1978# } 2131# }
1979 2132
2133 $startup_done->();
2134
1980 video_init; 2135 video_init;
1981 audio_init; 2136 audio_init;
1982} 2137}
2138
2139show_tip_of_the_day if $CFG->{show_tips};
1983 2140
1984Event::loop; 2141Event::loop;
1985#CFPlus::SDL_Quit; 2142#CFPlus::SDL_Quit;
1986#CFPlus::_exit 0; 2143#CFPlus::_exit 0;
1987 2144

Diff Legend

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