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.136 by root, Fri Dec 8 14:59:54 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) {
… …
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 ); 684 );
654 } 685 }
655 } 686 }
656 687
688 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 689
658 $table 690 $table
659} 691}
660 692
661sub stats_window { 693sub stats_window {
… …
663 expand => 1, 695 expand => 1,
664 scroll_y => 1 696 scroll_y => 1
665 ); 697 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 698 $r->add (my $vb = new CFPlus::UI::VBox);
667 699
700 $vb->add (new CFPlus::UI::FancyFrame
701 label => "Player",
702 child => (my $pi = new CFPlus::UI::VBox),
703 );
704
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 705 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 706 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."); 707 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, 708 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 710 tooltip => "The map you are currently on (if supported by the server).");
674 711
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 712 $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, 713 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 714 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 715 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, 716 $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, 717 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 718 tooltip => "The weight limit: you cannot carry more than this.");
682 719
720 $vb->add (new CFPlus::UI::FancyFrame
721 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 722 child => (my $hb = new CFPlus::UI::HBox expand => 1),
723 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 724 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 725
686 my $color2 = [1, 1, 0]; 726 my $color2 = [1, 1, 0];
687 727
688 for ( 728 for (
… …
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 749 $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, 750 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 751 align => -1, text => $label, tooltip => "#stat_$label");
712 } 752 }
713 753
754 $vb->add (new CFPlus::UI::FancyFrame
755 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 756 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
757 );
715 758
716 my $row = 0; 759 my $row = 0;
717 my $col = 0; 760 my $col = 0;
718 761
719 my %resist_names = ( 762 my %resist_names = (
… …
819 862
820 my $table = $METASERVER->{table}; 863 my $table = $METASERVER->{table};
821 $table->clear; 864 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 865 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 866
824 my $buf; 867 my $ok = 0;
825 868
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 869 CFPlus::background {
870 my $ua = CFPlus::lwp_useragent;
827 871
828 unless ($fh) { 872 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 873 } sub {
830 return; 874 my ($msg) = @_;
831 } 875 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; 876 $table->clear;
846 877
847 my @tip = ( 878 my @tip = (
848 "The current number of users logged in on the server.", 879 "The current number of users logged in on the server.",
849 "The hostname of the server.", 880 "The hostname of the server.",
… …
859 for 0 .. $#col; 890 for 0 .. $#col;
860 891
861 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
862 893
863 my $y = 0; 894 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} }
901 ) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
866 904
867 for ($desc) { 905 for ($desc) {
868 s/<br>/\n/gi; 906 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 907 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 908 s/<.*?>//sgi;
871 s/&/&amp;/g; 909 s/&amp;/&/g;
872 s/</&lt;/g; 910 s/&lt;/</g;
873 s/>/&gt;/g; 911 s/&gt;/>/g;
874 } 912 }
875 913
876 $uptime = sprintf "%dd %02d:%02d:%02d", 914 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 915 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 916 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 917 (int $uptime / 60) % 60,
880 $m->[8] % 60; 918 $uptime % 60;
881 919
882 $m = [$users, $host, $uptime, $version, $desc]; 920 $m = [$users, $host, $uptime, $version, $desc];
883 921
884 $y++; 922 $y++;
885 923
… …
895 ), 933 ),
896 (new CFPlus::UI::Empty expand => 1), 934 (new CFPlus::UI::Empty expand => 1),
897 ]); 935 ]);
898 936
899 $table->add ($_, $y, new CFPlus::UI::Label 937 $table->add ($_, $y, new CFPlus::UI::Label
938 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 939 ellipsise => 0,
901 align => $align[$_], 940 align => $align[$_],
902 text => $m->[$_], 941 text => $m->[$_],
903 tooltip => $tip[$_], 942 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 944 can_hover => 1,
905 can_events => 1, 945 can_events => 1,
906 fontsize => 0.8) 946 fontsize => 0.8)
907 for 0 .. $#$m; 947 for 0 .. $#$m;
908 } 948 }
949 } else {
950 $ok or $label->set_text ("error while contacting metaserver");
909 } 951 }
910 }); 952 };
953
911} 954}
912 955
913sub metaserver_dialog { 956sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 957 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 958 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 959 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 960
918 my $dialog = new CFPlus::UI::FancyFrame 961 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 962 title => "Server List",
920 name => 'metaserver_dialog', 963 name => 'metaserver_dialog',
921 x => 'center', 964 x => 'center',
922 y => 'center', 965 y => 'center',
923 z => 3, 966 z => 3,
967 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 968 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 969 child => $vbox,
926 has_close_button => 1, 970 has_close_button => 1,
927 table => $table, 971 table => $table,
928 on_visibility_change => sub { 972 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 973 update_metaserver ($_[0]) if $_[1];
… …
935} 979}
936 980
937sub server_setup { 981sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 982 my $vbox = new CFPlus::UI::VBox;
939 983
984 $vbox->add (new CFPlus::UI::FancyFrame
985 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 986 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
987 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 988 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 989
943 { 990 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 991 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 992
… …
1029 }, 1076 },
1030 ); 1077 );
1031 1078
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1079 $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 1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1081 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. " 1082 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. " 1083 . "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.", 1084 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1085 on_changed => sub {
1039 my ($self, $value) = @_; 1086 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1087 $CFG->{say_command} = $value;
1041 0 1088 0
1042 } 1089 }
1043 ); 1090 );
1044 1091
1092 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1093 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips},
1095 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1096 on_changed => sub {
1097 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value;
1099 0
1100 }
1101 );
1102
1045 $vbox->add (new CFPlus::UI::Label 1103 $vbox->add (new CFPlus::UI::FancyFrame
1046 text => "Server Info", 1104 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); 1105 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1106 );
1053 1107
1054 $vbox 1108 $vbox
1055} 1109}
1056 1110
1057sub message_window { 1111sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1112 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1113 name => "message_window",
1060 title => "Messages", 1114 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1115 border_bg => [1, 1, 1, 1],
1062 x => "max", 1116 x => "max",
1063 y => 0, 1117 y => 0,
… …
1113 window => $window, 1167 window => $window,
1114 input => $input, 1168 input => $input,
1115 }; 1169 };
1116 1170
1117 $window 1171 $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} 1172}
1175 1173
1176sub autopickup_setup { 1174sub autopickup_setup {
1177 my $table = new CFPlus::UI::Table; 1175 my $table = new CFPlus::UI::Table;
1178 1176
… …
1196 ["Boots" => PICKUP_BOOTS], 1194 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1195 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1196 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1197 ],
1200 1198
1201 ["Readables", 2, 2, 1199 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1200 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1201 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1202 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1203 ],
1206 ["Misc", 2, 7, 1204 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1205 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1206 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1207 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1208 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1209 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1210 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1211 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1212 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1213 ["Jewelery" => PICKUP_JEWELS],
1214 ["Flesh" => PICKUP_FLESH],
1216 ], 1215 ],
1217 ["Weight/Value ratio", 2, 17] 1216 ["Weight/Value ratio", 2, 17]
1218 ) 1217 )
1219 { 1218 {
1220 my ($title, $x, $y, @bits) = @$_; 1219 my ($title, $x, $y, @bits) = @$_;
… …
1270 $table 1269 $table
1271} 1270}
1272 1271
1273my %SORT_ORDER = ( 1272my %SORT_ORDER = (
1274 type => undef, 1273 type => undef,
1275 mtime => sub { sort { 1274 mtime => sub {
1275 my $NOW = time;
1276 sort {
1277 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1278 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1279
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1280 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1281 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1283 } @_
1279 } @_ }, 1284 },
1280 weight => sub { sort { 1285 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1286 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1287 or $a->{type} <=> $b->{type}
1283 } @_ }, 1288 } @_ },
1284); 1289);
… …
1309 #TODO# update to weigh/maxweight 1314 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1315 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1316
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1317 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1318 $sw1->add ($INV = new CFPlus::UI::Inventory);
1319 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1320
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1321 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1322
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1323 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1324
… …
1335 $PL_WINDOW->show; 1341 $PL_WINDOW->show;
1336 } 1342 }
1337} 1343}
1338 1344
1339sub player_window { 1345sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1346 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1347 x => "center",
1342 y => "center", 1348 y => "center",
1343 force_w => $WIDTH * 9/10, 1349 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1350 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1351 title => "Player",
… …
1358 $ntb->add ( 1364 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1365 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1366 "Shows all your Skills."
1361 ); 1367 );
1362 1368
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1369 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1370 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1371 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1372 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1373 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1374 );
1369 $ntb->add ( 1375 $ntb->add (
… …
1387 1393
1388 my $refresh; 1394 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub { 1395 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear (); 1396 $binding_list->clear ();
1391 1397
1398 return unless $PROFILE;
1399
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396 1404
1397 my $lbl = join "; ", @$cmds; 1405 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button 1408 $hb->add (new CFPlus::UI::Button
1401 text => "delete", 1409 text => "delete",
1402 tooltip => "Deletes the binding", 1410 tooltip => "Deletes the binding",
1403 on_activate => sub { 1411 on_activate => sub {
1404 $binding_list->remove ($hb); 1412 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1413 delete $PROFILE->{bindings}{$mod}{$sym};
1406 0 1414 0
1407 }); 1415 });
1408 1416
1409 $hb->add (new CFPlus::UI::Button 1417 $hb->add (new CFPlus::UI::Button
1410 text => "edit", 1418 text => "edit",
1411 tooltip => "Edits the binding", 1419 tooltip => "Edits the binding",
1412 on_activate => sub { 1420 on_activate => sub {
1413 $::BIND_EDITOR->set_binding ( 1421 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1415 sub { 1423 sub {
1416 my ($nmod, $nsym, $ncmds) = @_; 1424 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->(); 1427 $refresh->();
… …
1434 } 1442 }
1435 } 1443 }
1436 }; 1444 };
1437 1445
1438 my $vb = new CFPlus::UI::VBox; 1446 my $vb = new CFPlus::UI::VBox;
1447 $vb->add (new CFPlus::UI::FancyFrame
1448 label => "Options",
1439 $vb->add (my $hb = new CFPlus::UI::HBox); 1449 child => (my $hb = new CFPlus::UI::HBox),
1450 );
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1451 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox 1452 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1, 1453 expand => 1,
1443 state => $CFG->{shift_fire_stop}, 1454 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1455 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1446 my ($cbox, $value) = @_; 1457 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value; 1458 $CFG->{shift_fire_stop} = $value;
1448 0 1459 0
1449 }); 1460 });
1450 1461
1451 $vb->add ($binding_list); 1462 $vb->add (new CFPlus::UI::FancyFrame
1463 label => "Bindings",
1464 child => $binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox); 1465 $vb->add (my $hb = new CFPlus::UI::HBox);
1453 1466
1454 $hb->add (new CFPlus::UI::Button 1467 $hb->add (new CFPlus::UI::Button
1455 text => "record new", 1468 text => "record new",
1456 expand => 1, 1469 expand => 1,
… …
1489 1502
1490 $vb 1503 $vb
1491} 1504}
1492 1505
1493sub help_window { 1506sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1507 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1508 x => 'center',
1496 y => 'center', 1509 y => 'center',
1497 z => 2, 1510 z => 4,
1498 name => 'doc_browser', 1511 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1512 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1513 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1514 title => "Help Browser",
1502 has_close_button => 1; 1515 has_close_button => 1;
1503 1516
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1517 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1518
1519 $vbox->add (new CFPlus::UI::FancyFrame
1520 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1521 child => (my $buttons = new CFPlus::UI::HBox),
1522 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1523 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1524 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1525
1510 my @history; 1526 my @history;
1511 my @future; 1527 my @future;
1512 my $curnode; 1528 my $curnode;
1513 1529
1514 my $load_node; $load_node = sub { 1530 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1531 my ($node, $para) = @_;
1516 1532
1517 $buttons->clear; 1533 $buttons->clear;
1534
1535 $buttons->add (new CFPlus::UI::Button
1536 text => "⇤",
1537 tooltip => "back to the starting page",
1538 on_activate => sub {
1539 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1540 unshift @future, @history;
1541 @history = ();
1542 $load_node->(@{shift @future});
1543 },
1544 );
1518 1545
1519 if (@history) { 1546 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1547 $buttons->add (new CFPlus::UI::Button
1521 text => "<", 1548 text => "⋘",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1], 1549 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1550 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1551 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1552 $load_node->(@{pop @history});
1553 },
1526 }); 1554 );
1527 } 1555 }
1528 1556
1529 if (@future) { 1557 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button 1558 $buttons->add (new CFPlus::UI::Button
1531 text => ">", 1559 text => "⋙",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0], 1560 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1533 on_activate => sub { 1561 on_activate => sub {
1534 push @history, $curnode; 1562 push @history, [$curnode, $viewer->current_paragraph];
1535 $load_node->(shift @future); 1563 $load_node->(@{shift @future});
1564 },
1536 }); 1565 );
1537 } 1566 }
1567
1568 $buttons->add (new CFPlus::UI::Label text => " ");
1569
1570 my @path = CFPlus::Pod::full_path_of $node;
1571 pop @path; # drop current node
1572
1573 for my $node (@path) {
1574 $buttons->add (new CFPlus::UI::Button
1575 text => $node->{kw}[0],
1576 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1577 on_activate => sub {
1578 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1579 $load_node->($node);
1580 },
1581 );
1582 $buttons->add (new CFPlus::UI::Label text => "/");
1583 }
1584
1585 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1538 1586
1539 $curnode = $node; 1587 $curnode = $node;
1540 1588
1541 $viewer->clear; 1589 $viewer->clear;
1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1543 $viewer->set_offset (0); 1591 $viewer->scroll_to ($para);
1544 }; 1592 };
1545 1593
1546 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1594 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547 1595
1548 $CFPlus::Pod::on_link = sub { 1596 $CFPlus::Pod::goto_document = sub {
1549 my (@path) = @_; 1597 my (@path) = @_;
1550 1598
1551 push @history, $curnode if $curnode; 1599 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 @future = ();
1553 1600
1554 $load_node->(CFPlus::Pod::find @path); 1601 $load_node->((CFPlus::Pod::find @path)[0]);
1555 $win->show; 1602 $win->show;
1556 }; 1603 };
1557 1604
1558 $win 1605 $win
1606}
1607
1608sub open_string_query {
1609 my ($title, $cb, $txt, $tooltip) = @_;
1610 my $dialog = new CFPlus::UI::Toplevel
1611 x => "center",
1612 y => "center",
1613 z => 50,
1614 force_w => $WIDTH * 4/5,
1615 title => $title;
1616
1617 $dialog->add (
1618 my $e = new CFPlus::UI::Entry
1619 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1620 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1621 tooltip => $tooltip
1622 );
1623
1624 $e->grab_focus;
1625 $e->set_text ($txt) if $txt;
1626 $dialog->show;
1627}
1628
1629sub open_quit_dialog {
1630 unless ($QUIT_DIALOG) {
1631 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1632 x => "center",
1633 y => "center",
1634 z => 50,
1635 title => "Really Quit?",
1636 on_key_down => sub {
1637 my ($dialog, $ev) = @_;
1638 $ev->{sym} == 27 and $dialog->hide;
1639 }
1640 ;
1641
1642 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1643
1644 $vb->add (new CFPlus::UI::Label
1645 text => "You should find a savebed and apply it first!",
1646 max_w => $WIDTH * 0.25,
1647 ellipsize => 0,
1648 );
1649 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1650 $hb->add (new CFPlus::UI::Button
1651 text => "Ok",
1652 expand => 1,
1653 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1654 );
1655 $hb->add (new CFPlus::UI::Button
1656 text => "Quit anyway",
1657 expand => 1,
1658 on_activate => sub { exit },
1659 );
1660 }
1661
1662 $QUIT_DIALOG->show;
1663 $QUIT_DIALOG->grab_focus;
1664}
1665
1666sub show_tip_of_the_day {
1667 # find all tips
1668 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1669
1670 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1671 $todindex = 0 if $todindex >= @tod;
1672 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1673
1674 # create dialog
1675 my $dialog;
1676
1677 my $close = sub {
1678 $dialog->destroy;
1679 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1559} 1716}
1560 1717
1561sub sdl_init { 1718sub sdl_init {
1562 CFPlus::SDL_Init 1719 CFPlus::SDL_Init
1563 and die "SDL::Init failed!\n"; 1720 and die "SDL::Init failed!\n";
… …
1610 force_x => 0, 1767 force_x => 0,
1611 force_y => "max", 1768 force_y => "max",
1612 child => $STATUSBOX, 1769 child => $STATUSBOX,
1613 )->show; 1770 )->show;
1614 1771
1615 CFPlus::UI::FancyFrame->new ( 1772 CFPlus::UI::Toplevel->new (
1616 title => "Map", 1773 title => "Map",
1617 name => "mapmap", 1774 name => "mapmap",
1618 x => 0, 1775 x => 0,
1619 y => $FONTSIZE + 8, 1776 y => $FONTSIZE + 8,
1620 border_bg => [1, 1, 1, 192/255], 1777 border_bg => [1, 1, 1, 192/255],
… …
1648 can_hover => 1, 1805 can_hover => 1,
1649 can_events => 1, 1806 can_events => 1,
1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1807 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1651 ; 1808 ;
1652 1809
1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1810 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1654 title => "Setup", 1811 title => "Setup",
1655 name => "setup_dialog", 1812 name => "setup_dialog",
1656 x => 'center', 1813 x => 'center',
1657 y => 'center', 1814 y => 'center',
1658 z => 2, 1815 z => 2,
… …
1709 ); 1866 );
1710 1867
1711 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1868 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1712 tooltip => "View Documentation"); 1869 tooltip => "View Documentation");
1713 1870
1871
1714 $BUTTONBAR->add (new CFPlus::UI::Button 1872 $BUTTONBAR->add (new CFPlus::UI::Button
1715 text => "Quit", 1873 text => "Quit",
1716 tooltip => "Terminates the program", 1874 tooltip => "Terminates the program",
1717 on_activate => sub { 1875 on_activate => sub {
1718 if ($CONN) { 1876 if ($CONN) {
… …
1729 } 1887 }
1730 1888
1731 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1889 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1732} 1890}
1733 1891
1892sub setup_build_button {
1893 my ($enabled) = @_;
1894 if ($enabled) {
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build",
1897 tooltip => "Opens the ingame builder",
1898 on_activate => sub {
1899 if ($CONN) {
1900 $CONN->send_ext_req (builder_player_items => sub {
1901 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1902 });
1903 }
1904 0
1905 };
1906 $BUTTONBAR->add ($BUILD_BUTTON);
1907 } else {
1908 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1909 }
1910}
1911
1912sub open_ingame_editor {
1913 my ($msg) = @_;
1914
1915 my $win = new CFPlus::UI::Toplevel
1916 x => 0,
1917 y => 'center',
1918 z => 4,
1919 name => 'builder_window',
1920 force_w => int $WIDTH * 1/4,
1921 force_h => int $HEIGHT * 3/4,
1922 title => "In game builder",
1923 has_close_button => 1;
1924
1925 my $r = new CFPlus::UI::ScrolledWindow (
1926 expand => 1,
1927 scroll_y => 1
1928 );
1929 $r->add (my $vb = new CFPlus::UI::VBox);
1930 $win->add ($r);
1931
1932
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "Disable build mode",
1936 on_activate => sub { $::IN_BUILD_MODE = undef }
1937 );
1938 $vb->add (
1939 new CFPlus::UI::Button
1940 text => "ERASE",
1941 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1942 );
1943
1944 for my $itemarchname (
1945 sort {
1946 $msg->{items}->{$a}->{build_arch_name}
1947 cmp $msg->{items}->{$b}->{build_arch_name}
1948 } keys %{$msg->{items}}
1949 ) {
1950 my $info = $msg->{items}->{$itemarchname};
1951 $vb->add (
1952 new CFPlus::UI::Button text => $info->{build_arch_name},
1953 on_activate => sub {
1954 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1955
1956 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1957 build_mode_query_arch_info ();
1958 }
1959 }
1960 );
1961 }
1962
1963 $win->show;
1964}
1965
1966sub build_mode_query_arch_info {
1967 my ($iteminfo) = $::IN_BUILD_MODE;
1968 my $itemarchname = $iteminfo->{item};
1969 my $info = $iteminfo->{info};
1970
1971 my $dialog = new CFPlus::UI::Toplevel
1972 x => "center",
1973 y => "center",
1974 z => 50,
1975 force_w => int $WIDTH * 1/2,
1976 title => "Enter information for placement of '$itemarchname'",
1977 has_close_button => 1;
1978
1979 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1980
1981 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1982 my $row = 0;
1983 if ($info->{has_name}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1986 }
1987 if ($info->{has_text}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1989 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1990 }
1991 if ($info->{has_connection}) {
1992 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1993 $table->add (1, $row++,
1994 new CFPlus::UI::Entry
1995 expand => 1,
1996 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1997 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1998 );
1999 }
2000
2001 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2002 $hb->add (new CFPlus::UI::Button
2003 text => "Close",
2004 expand => 1,
2005 on_activate => sub { $dialog->hide; 0 },
2006 );
2007 $dialog->show;
2008}
2009
1734sub video_shutdown { 2010sub video_shutdown {
1735 CFPlus::OpenGL::shutdown; 2011 CFPlus::OpenGL::shutdown;
1736 2012
1737 undef $SDL_ACTIVE; 2013 undef $SDL_ACTIVE;
1738} 2014}
… …
1769 CFPlus::Mix_AllocateChannels 8; 2045 CFPlus::Mix_AllocateChannels 8;
1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2046 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1771 2047
1772 audio_music_finished; 2048 audio_music_finished;
1773 2049
2050 local $_;
1774 while (<$fh>) { 2051 while (<$fh>) {
1775 next if /^\s*#/; 2052 next if /^\s*#/;
1776 next if /^\s*$/; 2053 next if /^\s*$/;
1777 2054
1778 my ($file, $volume, $event) = split /\s+/, $_, 3; 2055 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1912 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
1913 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
1914 gauge_size => 0.35, 2191 gauge_size => 0.35,
1915 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
1916 mapsize => 100, 2193 mapsize => 100,
1917 say_command => 'say', 2194 say_command => 'chat',
1918 audio_enable => 1, 2195 audio_enable => 1,
1919 bgm_enable => 1, 2196 bgm_enable => 1,
1920 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
1921 face_prefetch => 0, 2198 face_prefetch => 0,
1922 output_sync => 1, 2199 output_sync => 1,
1923 output_count => 1, 2200 output_count => 1,
1924 pickup => 0, 2201 pickup => 0,
1925 inv_sort => "mtime", 2202 inv_sort => "mtime",
1926 default => "profile", # default profile 2203 default => "profile", # default profile
2204 show_tips => 1,
1927 ); 2205 );
1928 2206
1929 while (my ($k, $v) = each %DEF_CFG) { 2207 while (my ($k, $v) = each %DEF_CFG) {
1930 $CFG->{$k} = $v unless exists $CFG->{$k}; 2208 $CFG->{$k} = $v unless exists $CFG->{$k};
1931 } 2209 }
… …
1975# } 2253# }
1976# my $t2 = Time::HiRes::time; 2254# my $t2 = Time::HiRes::time;
1977# warn $t2-$t1; 2255# warn $t2-$t1;
1978# } 2256# }
1979 2257
2258 $startup_done->();
2259
1980 video_init; 2260 video_init;
1981 audio_init; 2261 audio_init;
1982} 2262}
2263
2264show_tip_of_the_day if $CFG->{show_tips};
1983 2265
1984Event::loop; 2266Event::loop;
1985#CFPlus::SDL_Quit; 2267#CFPlus::SDL_Quit;
1986#CFPlus::_exit 0; 2268#CFPlus::_exit 0;
1987 2269

Diff Legend

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