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.113 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 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;
… …
138our $BIND_EDITOR; 150our $BIND_EDITOR;
139our $BIND_UPD_CB; 151our $BIND_UPD_CB;
140 152
141our $PICKUP_CFG; 153our $PICKUP_CFG;
142 154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
143sub status { 158sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 160}
146 161
147sub debug { 162sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
164}
165
166sub message {
167 my ($para) = @_;
168
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
149} 175}
150 176
151sub destroy_query_dialog { 177sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
… …
155 181
156# server query dialog 182# server query dialog
157sub server_query { 183sub server_query {
158 my ($conn, $flags, $prompt) = @_; 184 my ($conn, $flags, $prompt) = @_;
159 185
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 187 x => "center",
162 y => "center", 188 y => "center",
163 title => "Server Query", 189 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 190 child => my $vbox = new CFPlus::UI::VBox,
165 ; 191 ;
… …
352 status "logging in..."; 378 status "logging in...";
353 379
354 $LOGIN_BUTTON->set_text ("Logout"); 380 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 381 $SETUP_DIALOG->hide;
356 382
383 $PROFILE = $CFG->{profile}{default};
384
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 386
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 387 my ($host, $port) = split /:/, $PROFILE->{host};
360 388
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 389 $MAP = new CFPlus::Map;
362 390
363 $CONN = eval { 391 $CONN = eval {
364 new CFPlus::Protocol 392 new CFPlus::Protocol
365 host => $host, 393 host => $host,
366 port => $port || 13327, 394 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 395 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 396 pass => $PROFILE->{password},
369 mapw => $mapsize, 397 mapw => $mapsize,
370 maph => $mapsize, 398 maph => $mapsize,
399
400 client => "cfplus $CFPlus::VERSION $] $^O",
371 401
372 map_widget => $MAPWIDGET, 402 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 403 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 404 statusbox => $STATUSBOX,
375 map => $MAP, 405 map => $MAP,
… …
402sub stop_game { 432sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 433 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 435 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 436 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 437 $SPELL_LIST->clear_spells;
408 438
409 return unless $CONN; 439 return unless $CONN;
410 440
411 status "connection closed"; 441 status "connection closed";
412 442
… …
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 669 $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"); 670 $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 }); 671 $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"); 672 $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 }); 673 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
644 675
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 677
647 for my $x (0..2) { 678 for my $x (0..2) {
648 for my $y (0 .. 2) { 679 for my $y (0 .. 2) {
… …
663 expand => 1, 694 expand => 1,
664 scroll_y => 1 695 scroll_y => 1
665 ); 696 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 697 $r->add (my $vb = new CFPlus::UI::VBox);
667 698
699 $vb->add (new CFPlus::UI::FancyFrame
700 label => "Player",
701 child => (my $pi = new CFPlus::UI::VBox),
702 );
703
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 704 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 705 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."); 706 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, 707 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 708 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 709 tooltip => "The map you are currently on (if supported by the server).");
674 710
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 711 $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, 712 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 713 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 714 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, 715 $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, 716 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 717 tooltip => "The weight limit: you cannot carry more than this.");
682 718
719 $vb->add (new CFPlus::UI::FancyFrame
720 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 721 child => (my $hb = new CFPlus::UI::HBox expand => 1),
722 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 723 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 724
686 my $color2 = [1, 1, 0]; 725 my $color2 = [1, 1, 0];
687 726
688 for ( 727 for (
… …
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 748 $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, 749 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 750 align => -1, text => $label, tooltip => "#stat_$label");
712 } 751 }
713 752
753 $vb->add (new CFPlus::UI::FancyFrame
754 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 755 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
756 );
715 757
716 my $row = 0; 758 my $row = 0;
717 my $col = 0; 759 my $col = 0;
718 760
719 my %resist_names = ( 761 my %resist_names = (
… …
819 861
820 my $table = $METASERVER->{table}; 862 my $table = $METASERVER->{table};
821 $table->clear; 863 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 864 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 865
824 my $buf; 866 my $ok = 0;
825 867
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 868 CFPlus::background {
869 my $ua = CFPlus::lwp_useragent;
827 870
828 unless ($fh) { 871 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 872 } sub {
830 return; 873 my ($msg) = @_;
831 } 874 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; 875 $table->clear;
846 876
847 my @tip = ( 877 my @tip = (
848 "The current number of users logged in on the server.", 878 "The current number of users logged in on the server.",
849 "The hostname of the server.", 879 "The hostname of the server.",
… …
859 for 0 .. $#col; 889 for 0 .. $#col;
860 890
861 my @align = qw(1 0 1 1 -1); 891 my @align = qw(1 0 1 1 -1);
862 892
863 my $y = 0; 893 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 894 for my $m (
895 sort {
896 $b->{version} <=> $a->{version}
897 or $b->{users} <=> $a->{users}
898 }
899 @{ $msg->{servers} }
900 ) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 901 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
902 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
866 903
867 for ($desc) { 904 for ($desc) {
868 s/<br>/\n/gi; 905 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 906 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 907 s/<.*?>//sgi;
871 s/&/&amp;/g; 908 s/&amp;/&/g;
872 s/</&lt;/g; 909 s/&lt;/</g;
873 s/>/&gt;/g; 910 s/&gt;/>/g;
874 } 911 }
875 912
876 $uptime = sprintf "%dd %02d:%02d:%02d", 913 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 914 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 915 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 916 (int $uptime / 60) % 60,
880 $m->[8] % 60; 917 $uptime % 60;
881 918
882 $m = [$users, $host, $uptime, $version, $desc]; 919 $m = [$users, $host, $uptime, $version, $desc];
883 920
884 $y++; 921 $y++;
885 922
… …
895 ), 932 ),
896 (new CFPlus::UI::Empty expand => 1), 933 (new CFPlus::UI::Empty expand => 1),
897 ]); 934 ]);
898 935
899 $table->add ($_, $y, new CFPlus::UI::Label 936 $table->add ($_, $y, new CFPlus::UI::Label
937 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 938 ellipsise => 0,
901 align => $align[$_], 939 align => $align[$_],
902 text => $m->[$_], 940 text => $m->[$_],
903 tooltip => $tip[$_], 941 tooltip => $tip[$_],
942 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 943 can_hover => 1,
905 can_events => 1, 944 can_events => 1,
906 fontsize => 0.8) 945 fontsize => 0.8)
907 for 0 .. $#$m; 946 for 0 .. $#$m;
908 } 947 }
948 } else {
949 $ok or $label->set_text ("error while contacting metaserver");
909 } 950 }
910 }); 951 };
952
911} 953}
912 954
913sub metaserver_dialog { 955sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 956 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 957 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 958 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 959
918 my $dialog = new CFPlus::UI::FancyFrame 960 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 961 title => "Server List",
920 name => 'metaserver_dialog', 962 name => 'metaserver_dialog',
921 x => 'center', 963 x => 'center',
922 y => 'center', 964 y => 'center',
923 z => 3, 965 z => 3,
966 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 967 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 968 child => $vbox,
926 has_close_button => 1, 969 has_close_button => 1,
927 table => $table, 970 table => $table,
928 on_visibility_change => sub { 971 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 972 update_metaserver ($_[0]) if $_[1];
… …
935} 978}
936 979
937sub server_setup { 980sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 981 my $vbox = new CFPlus::UI::VBox;
939 982
983 $vbox->add (new CFPlus::UI::FancyFrame
984 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 985 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
986 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 987 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 988
943 { 989 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 990 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 991
… …
1029 }, 1075 },
1030 ); 1076 );
1031 1077
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1078 $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 1079 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1080 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. " 1081 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. " 1082 . "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.", 1083 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1084 on_changed => sub {
1039 my ($self, $value) = @_; 1085 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1086 $CFG->{say_command} = $value;
1041 0 1087 0
1042 } 1088 }
1043 ); 1089 );
1044 1090
1091 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1092 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1093 state => $CFG->{show_tips},
1094 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1095 on_changed => sub {
1096 my ($self, $value) = @_;
1097 $CFG->{show_tips} = $value;
1098 0
1099 }
1100 );
1101
1045 $vbox->add (new CFPlus::UI::Label 1102 $vbox->add (new CFPlus::UI::FancyFrame
1046 text => "Server Info", 1103 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); 1104 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1105 );
1053 1106
1054 $vbox 1107 $vbox
1055} 1108}
1056 1109
1057sub message_window { 1110sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1111 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1112 name => "message_window",
1060 title => "Messages", 1113 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1114 border_bg => [1, 1, 1, 1],
1062 x => "max", 1115 x => "max",
1063 y => 0, 1116 y => 0,
… …
1113 window => $window, 1166 window => $window,
1114 input => $input, 1167 input => $input,
1115 }; 1168 };
1116 1169
1117 $window 1170 $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} 1171}
1175 1172
1176sub autopickup_setup { 1173sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table; 1174 my $table = new CFPlus::UI::Table;
1178 1175
… …
1196 ["Boots" => PICKUP_BOOTS], 1193 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1194 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1195 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1196 ],
1200 1197
1201 ["Readables", 2, 2, 1198 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1199 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1202 ],
1206 ["Misc", 2, 7, 1203 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1204 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1205 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1207 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1208 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1209 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1212 ["Jewelery" => PICKUP_JEWELS],
1213 ["Flesh" => PICKUP_FLESH],
1216 ], 1214 ],
1217 ["Weight/Value ratio", 2, 17] 1215 ["Weight/Value ratio", 2, 17]
1218 ) 1216 )
1219 { 1217 {
1220 my ($title, $x, $y, @bits) = @$_; 1218 my ($title, $x, $y, @bits) = @$_;
… …
1270 $table 1268 $table
1271} 1269}
1272 1270
1273my %SORT_ORDER = ( 1271my %SORT_ORDER = (
1274 type => undef, 1272 type => undef,
1275 mtime => sub { sort { 1273 mtime => sub {
1274 my $NOW = time;
1275 sort {
1276 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1277 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1278
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1279 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1280 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1281 or $a->{type} <=> $b->{type}
1282 } @_
1279 } @_ }, 1283 },
1280 weight => sub { sort { 1284 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1285 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1286 or $a->{type} <=> $b->{type}
1283 } @_ }, 1287 } @_ },
1284); 1288);
… …
1309 #TODO# update to weigh/maxweight 1313 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1314 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1315
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1316 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1317 $sw1->add ($INV = new CFPlus::UI::Inventory);
1318 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1319
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1320 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1321
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1322 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1323
… …
1335 $PL_WINDOW->show; 1340 $PL_WINDOW->show;
1336 } 1341 }
1337} 1342}
1338 1343
1339sub player_window { 1344sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1345 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1346 x => "center",
1342 y => "center", 1347 y => "center",
1343 force_w => $WIDTH * 9/10, 1348 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1349 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1350 title => "Player",
… …
1358 $ntb->add ( 1363 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1364 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1365 "Shows all your Skills."
1361 ); 1366 );
1362 1367
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1368 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1369 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1370 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1371 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1372 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1373 );
1369 $ntb->add ( 1374 $ntb->add (
… …
1387 1392
1388 my $refresh; 1393 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub { 1394 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear (); 1395 $binding_list->clear ();
1391 1396
1397 return unless $PROFILE;
1398
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1399 for my $mod (keys %{$PROFILE->{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1400 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1401 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1402 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396 1403
1397 my $lbl = join "; ", @$cmds; 1404 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1405 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1406 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button 1407 $hb->add (new CFPlus::UI::Button
1401 text => "delete", 1408 text => "delete",
1402 tooltip => "Deletes the binding", 1409 tooltip => "Deletes the binding",
1403 on_activate => sub { 1410 on_activate => sub {
1404 $binding_list->remove ($hb); 1411 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1412 delete $PROFILE->{bindings}{$mod}{$sym};
1406 0 1413 0
1407 }); 1414 });
1408 1415
1409 $hb->add (new CFPlus::UI::Button 1416 $hb->add (new CFPlus::UI::Button
1410 text => "edit", 1417 text => "edit",
1411 tooltip => "Edits the binding", 1418 tooltip => "Edits the binding",
1412 on_activate => sub { 1419 on_activate => sub {
1413 $::BIND_EDITOR->set_binding ( 1420 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1421 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1415 sub { 1422 sub {
1416 my ($nmod, $nsym, $ncmds) = @_; 1423 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1424 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1425 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->(); 1426 $refresh->();
… …
1434 } 1441 }
1435 } 1442 }
1436 }; 1443 };
1437 1444
1438 my $vb = new CFPlus::UI::VBox; 1445 my $vb = new CFPlus::UI::VBox;
1446 $vb->add (new CFPlus::UI::FancyFrame
1447 label => "Options",
1439 $vb->add (my $hb = new CFPlus::UI::HBox); 1448 child => (my $hb = new CFPlus::UI::HBox),
1449 );
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1450 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox 1451 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1, 1452 expand => 1,
1443 state => $CFG->{shift_fire_stop}, 1453 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1454 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1446 my ($cbox, $value) = @_; 1456 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value; 1457 $CFG->{shift_fire_stop} = $value;
1448 0 1458 0
1449 }); 1459 });
1450 1460
1451 $vb->add ($binding_list); 1461 $vb->add (new CFPlus::UI::FancyFrame
1462 label => "Bindings",
1463 child => $binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox); 1464 $vb->add (my $hb = new CFPlus::UI::HBox);
1453 1465
1454 $hb->add (new CFPlus::UI::Button 1466 $hb->add (new CFPlus::UI::Button
1455 text => "record new", 1467 text => "record new",
1456 expand => 1, 1468 expand => 1,
… …
1489 1501
1490 $vb 1502 $vb
1491} 1503}
1492 1504
1493sub help_window { 1505sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1506 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1507 x => 'center',
1496 y => 'center', 1508 y => 'center',
1497 z => 2, 1509 z => 4,
1498 name => 'doc_browser', 1510 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1511 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1512 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1513 title => "Help Browser",
1502 has_close_button => 1; 1514 has_close_button => 1;
1503 1515
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1516 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1517
1518 $vbox->add (new CFPlus::UI::FancyFrame
1519 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1520 child => (my $buttons = new CFPlus::UI::HBox),
1521 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1522 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1523 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1524
1510 my @history; 1525 my @history;
1511 my @future; 1526 my @future;
1512 my $curnode; 1527 my $curnode;
1513 1528
1514 my $load_node; $load_node = sub { 1529 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1530 my ($node, $para) = @_;
1516 1531
1517 $buttons->clear; 1532 $buttons->clear;
1533
1534 $buttons->add (new CFPlus::UI::Button
1535 text => "⇤",
1536 tooltip => "back to the starting page",
1537 on_activate => sub {
1538 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1539 unshift @future, @history;
1540 @history = ();
1541 $load_node->(@{shift @future});
1542 },
1543 );
1518 1544
1519 if (@history) { 1545 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1546 $buttons->add (new CFPlus::UI::Button
1521 text => "⋘", 1547 text => "⋘",
1522 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1548 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1549 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1550 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1551 $load_node->(@{pop @history});
1526 }, 1552 },
1527 ); 1553 );
1528 } 1554 }
1529 1555
1530 if (@future) { 1556 if (@future) {
1531 $buttons->add (new CFPlus::UI::Button 1557 $buttons->add (new CFPlus::UI::Button
1532 text => "⋙", 1558 text => "⋙",
1533 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1559 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1534 on_activate => sub { 1560 on_activate => sub {
1535 push @history, $curnode; 1561 push @history, [$curnode, $viewer->current_paragraph];
1536 $load_node->(shift @future); 1562 $load_node->(@{shift @future});
1537 }, 1563 },
1538 ); 1564 );
1539 } 1565 }
1540 1566
1541 $buttons->add (new CFPlus::UI::Label text => " "); 1567 $buttons->add (new CFPlus::UI::Label text => " ");
… …
1546 for my $node (@path) { 1572 for my $node (@path) {
1547 $buttons->add (new CFPlus::UI::Button 1573 $buttons->add (new CFPlus::UI::Button
1548 text => $node->{kw}[0], 1574 text => $node->{kw}[0],
1549 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1575 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1550 on_activate => sub { 1576 on_activate => sub {
1551 push @history, $curnode if $curnode; @future = (); 1577 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 $load_node->($node); 1578 $load_node->($node);
1553 }, 1579 },
1554 ); 1580 );
1555 $buttons->add (new CFPlus::UI::Label text => "/"); 1581 $buttons->add (new CFPlus::UI::Label text => "/");
1556 } 1582 }
1557 1583
1558 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0]); 1584 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1559 1585
1560 $curnode = $node; 1586 $curnode = $node;
1561 1587
1562 $viewer->clear; 1588 $viewer->clear;
1563 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1589 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1564 $viewer->set_offset (0); 1590 $viewer->scroll_to ($para);
1565 }; 1591 };
1566 1592
1567 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1593 $load_node->(CFPlus::Pod::find pod => "mainpage");
1568 1594
1569 $CFPlus::Pod::goto_document = sub { 1595 $CFPlus::Pod::goto_document = sub {
1570 my (@path) = @_; 1596 my (@path) = @_;
1571 1597
1572 push @history, $curnode if $curnode; @future = (); 1598 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1573 1599
1574 $load_node->(CFPlus::Pod::find @path); 1600 $load_node->((CFPlus::Pod::find @path)[0]);
1575 $win->show; 1601 $win->show;
1576 }; 1602 };
1577 1603
1578 $win 1604 $win
1605}
1606
1607sub open_string_query {
1608 my ($title, $cb, $txt, $tooltip) = @_;
1609 my $dialog = new CFPlus::UI::Toplevel
1610 x => "center",
1611 y => "center",
1612 z => 50,
1613 force_w => $WIDTH * 4/5,
1614 title => $title;
1615
1616 $dialog->add (
1617 my $e = new CFPlus::UI::Entry
1618 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1619 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1620 tooltip => $tooltip
1621 );
1622
1623 $e->grab_focus;
1624 $e->set_text ($txt) if $txt;
1625 $dialog->show;
1626}
1627
1628sub open_quit_dialog {
1629 unless ($QUIT_DIALOG) {
1630 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1631 x => "center",
1632 y => "center",
1633 z => 50,
1634 title => "Really Quit?",
1635 on_key_down => sub {
1636 my ($dialog, $ev) = @_;
1637 $ev->{sym} == 27 and $dialog->hide;
1638 }
1639 ;
1640
1641 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1642
1643 $vb->add (new CFPlus::UI::Label
1644 text => "You should find a savebed and apply it first!",
1645 max_w => $WIDTH * 0.25,
1646 ellipsize => 0,
1647 );
1648 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Ok",
1651 expand => 1,
1652 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1653 );
1654 $hb->add (new CFPlus::UI::Button
1655 text => "Quit anyway",
1656 expand => 1,
1657 on_activate => sub { exit },
1658 );
1659 }
1660
1661 $QUIT_DIALOG->show;
1662 $QUIT_DIALOG->grab_focus;
1663}
1664
1665sub show_tip_of_the_day {
1666 # find all tips
1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668
1669 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1670 $todindex = 0 if $todindex >= @tod;
1671 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1672
1673 # create dialog
1674 my $dialog;
1675
1676 my $close = sub {
1677 $dialog->destroy;
1678 };
1679
1680 $dialog = new CFPlus::UI::Toplevel
1681 x => "center",
1682 y => "center",
1683 z => 3,
1684 name => 'tip_of_the_day',
1685 force_w => int $WIDTH * 4/9,
1686 force_h => int $WIDTH * 2/9,
1687 title => "Tip of the day #" . (1 + $todindex),
1688 child => my $vbox = new CFPlus::UI::VBox,
1689 has_close_button => 1,
1690 on_delete => $close,
1691 ;
1692
1693 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1694 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1695 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1696
1697 $vbox->add (my $table = new CFPlus::UI::Table);
1698
1699 $table->add (0, 0, new CFPlus::UI::Button
1700 text => "Close",
1701 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>.",
1702 on_activate => $close,
1703 );
1704
1705 $table->add (2, 0, new CFPlus::UI::Button
1706 text => "Next",
1707 tooltip => "Show the next <b>Tip of the day</b>.",
1708 on_activate => sub {
1709 $close->();
1710 &show_tip_of_the_day;
1711 },
1712 );
1713
1714 $dialog->show;
1579} 1715}
1580 1716
1581sub sdl_init { 1717sub sdl_init {
1582 CFPlus::SDL_Init 1718 CFPlus::SDL_Init
1583 and die "SDL::Init failed!\n"; 1719 and die "SDL::Init failed!\n";
… …
1630 force_x => 0, 1766 force_x => 0,
1631 force_y => "max", 1767 force_y => "max",
1632 child => $STATUSBOX, 1768 child => $STATUSBOX,
1633 )->show; 1769 )->show;
1634 1770
1635 CFPlus::UI::FancyFrame->new ( 1771 CFPlus::UI::Toplevel->new (
1636 title => "Map", 1772 title => "Map",
1637 name => "mapmap", 1773 name => "mapmap",
1638 x => 0, 1774 x => 0,
1639 y => $FONTSIZE + 8, 1775 y => $FONTSIZE + 8,
1640 border_bg => [1, 1, 1, 192/255], 1776 border_bg => [1, 1, 1, 192/255],
… …
1668 can_hover => 1, 1804 can_hover => 1,
1669 can_events => 1, 1805 can_events => 1,
1670 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1806 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1671 ; 1807 ;
1672 1808
1673 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1809 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1674 title => "Setup", 1810 title => "Setup",
1675 name => "setup_dialog", 1811 name => "setup_dialog",
1676 x => 'center', 1812 x => 'center',
1677 y => 'center', 1813 y => 'center',
1678 z => 2, 1814 z => 2,
… …
1729 ); 1865 );
1730 1866
1731 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1867 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1732 tooltip => "View Documentation"); 1868 tooltip => "View Documentation");
1733 1869
1870
1734 $BUTTONBAR->add (new CFPlus::UI::Button 1871 $BUTTONBAR->add (new CFPlus::UI::Button
1735 text => "Quit", 1872 text => "Quit",
1736 tooltip => "Terminates the program", 1873 tooltip => "Terminates the program",
1737 on_activate => sub { 1874 on_activate => sub {
1738 if ($CONN) { 1875 if ($CONN) {
… …
1749 } 1886 }
1750 1887
1751 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1888 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1752} 1889}
1753 1890
1891sub setup_build_button {
1892 my ($enabled) = @_;
1893 if ($enabled) {
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build",
1896 tooltip => "Opens the ingame builder",
1897 on_activate => sub {
1898 if ($CONN) {
1899 $CONN->send_ext_req (builder_player_items => sub {
1900 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901 });
1902 }
1903 0
1904 };
1905 $BUTTONBAR->add ($BUILD_BUTTON);
1906 } else {
1907 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1908 }
1909}
1910
1911sub open_ingame_editor {
1912 my ($msg) = @_;
1913
1914 my $win = new CFPlus::UI::Toplevel
1915 x => 0,
1916 y => 'center',
1917 z => 4,
1918 name => 'builder_window',
1919 force_w => int $WIDTH * 1/4,
1920 force_h => int $HEIGHT * 3/4,
1921 title => "In game builder",
1922 has_close_button => 1;
1923
1924 my $r = new CFPlus::UI::ScrolledWindow (
1925 expand => 1,
1926 scroll_y => 1
1927 );
1928 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r);
1930
1931
1932 $vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef });
1933 $vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } });
1934
1935 for my $itemarchname (keys %{$msg->{items}}) {
1936 $vb->add (
1937 new CFPlus::UI::Button text => "$itemarchname",
1938 on_activate => sub {
1939 $::IN_BUILD_MODE = $itemarchname;
1940 }
1941 );
1942 }
1943
1944 $win->show;
1945}
1946
1754sub video_shutdown { 1947sub video_shutdown {
1755 CFPlus::OpenGL::shutdown; 1948 CFPlus::OpenGL::shutdown;
1756 1949
1757 undef $SDL_ACTIVE; 1950 undef $SDL_ACTIVE;
1758} 1951}
… …
1789 CFPlus::Mix_AllocateChannels 8; 1982 CFPlus::Mix_AllocateChannels 8;
1790 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1983 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1791 1984
1792 audio_music_finished; 1985 audio_music_finished;
1793 1986
1987 local $_;
1794 while (<$fh>) { 1988 while (<$fh>) {
1795 next if /^\s*#/; 1989 next if /^\s*#/;
1796 next if /^\s*$/; 1990 next if /^\s*$/;
1797 1991
1798 my ($file, $volume, $event) = split /\s+/, $_, 3; 1992 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1932 log_fontsize => 0.7, 2126 log_fontsize => 0.7,
1933 gauge_fontsize => 1, 2127 gauge_fontsize => 1,
1934 gauge_size => 0.35, 2128 gauge_size => 0.35,
1935 stat_fontsize => 0.7, 2129 stat_fontsize => 0.7,
1936 mapsize => 100, 2130 mapsize => 100,
1937 say_command => 'say', 2131 say_command => 'chat',
1938 audio_enable => 1, 2132 audio_enable => 1,
1939 bgm_enable => 1, 2133 bgm_enable => 1,
1940 bgm_volume => 0.25, 2134 bgm_volume => 0.25,
1941 face_prefetch => 0, 2135 face_prefetch => 0,
1942 output_sync => 1, 2136 output_sync => 1,
1943 output_count => 1, 2137 output_count => 1,
1944 pickup => 0, 2138 pickup => 0,
1945 inv_sort => "mtime", 2139 inv_sort => "mtime",
1946 default => "profile", # default profile 2140 default => "profile", # default profile
2141 show_tips => 1,
1947 ); 2142 );
1948 2143
1949 while (my ($k, $v) = each %DEF_CFG) { 2144 while (my ($k, $v) = each %DEF_CFG) {
1950 $CFG->{$k} = $v unless exists $CFG->{$k}; 2145 $CFG->{$k} = $v unless exists $CFG->{$k};
1951 } 2146 }
… …
1995# } 2190# }
1996# my $t2 = Time::HiRes::time; 2191# my $t2 = Time::HiRes::time;
1997# warn $t2-$t1; 2192# warn $t2-$t1;
1998# } 2193# }
1999 2194
2195 $startup_done->();
2196
2000 video_init; 2197 video_init;
2001 audio_init; 2198 audio_init;
2002} 2199}
2200
2201show_tip_of_the_day if $CFG->{show_tips};
2003 2202
2004Event::loop; 2203Event::loop;
2005#CFPlus::SDL_Quit; 2204#CFPlus::SDL_Quit;
2006#CFPlus::_exit 0; 2205#CFPlus::_exit 0;
2007 2206

Diff Legend

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